From patchwork Fri Mar 1 13:29:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Romanov X-Patchwork-Id: 208834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp1078031dyb; Fri, 1 Mar 2024 05:32:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWdyWDEtlCIWW/UDTRkx9yK/cdxKqpCOKw2Xo3zw9ZwHNxgVr+P4vhpdVtjQ8oTpnpBcKEnIzNFa5S9sDg79ULfJOxYew== X-Google-Smtp-Source: AGHT+IFUq+WehfFYmwDkb74sz+3HbOVGkHvghW6l87ji/28vBi09YEXs//0m4JUT9Hc+xZotGn9w X-Received: by 2002:a05:6a20:d388:b0:1a0:ee93:8907 with SMTP id iq8-20020a056a20d38800b001a0ee938907mr1573380pzb.49.1709299939449; Fri, 01 Mar 2024 05:32:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709299939; cv=pass; d=google.com; s=arc-20160816; b=LMqYYzmZNgyVCIa1avIgRiIDAmlwy5inaH/bvxseYJR5CtZNF5P4mRRYaBbB8AUay2 vie3iursqWg+FkfftH0M49zkOqA5AC0CbDvBwQAo6FegAL5gAvBoF45G+/pvvuZM0nYA 9+TqQecYLoTV6eIOeWheBjFCM65GPZ7jzDAmh4rwJvMMkNbeK5Zo650uUrgd5+pjyyBJ XSIrP4o/Y0ZvbZhSJfWbXzKkJGYN65bRgjI0WBwKr0xPacqY59T3Xss/urXFIBJq7GgL Nit69TvZwXCgoIiAhnpt8gOFcWkjYstR3Jx4SnJMLdFEvZOFaTby+4Si2yTNgzG7NtwZ 3uIQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-filter; bh=WE/zZwdFVN3vK0ruTtDHdqty2Ucp8AxmvVeoKM60cVo=; fh=7+QqR+U+m0B5ryyywou1kgMZVOfT/GgVHz0ZH2Lvlxg=; b=qLfng4N8PuatCS2OnO9+gtCT800LSdH+Nk0qOdk7HNSWNdDct94ijfRb1RCvoCyLn6 S5ltqzuw3rKjJGHfu0DiEw0rqr1TSDKoX4kkTmg8OZBrxdr+uIiD48wUuIrfa40Lr8nN 8N0ZQOmhHX10lTaHtfJkrw/LjzAwW8fIODHQj4tNn20nhLFz7p1yM9Ik3Z8ZLi9q5haw E2sj1XdUcnXMBYzI0QDns2KNgLfAxhgz71l1pOByQXKVXCpwgVr4r0s/Vry7w+GUmrOL m8Qv/zPIyIg0buWNT1o1fuzIIqey2mMyUeE/UDeNYaK9+SW2cHpyywf7C4rLUpyBCA4F n6Mg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=o0FQfcY4; arc=pass (i=1 spf=pass spfdomain=salutedevices.com dkim=pass dkdomain=salutedevices.com dmarc=pass fromdomain=salutedevices.com); spf=pass (google.com: domain of linux-kernel+bounces-88467-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88467-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=salutedevices.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id b186-20020a6367c3000000b005dc85635271si3538528pgc.605.2024.03.01.05.32.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:32:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88467-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@salutedevices.com header.s=mail header.b=o0FQfcY4; arc=pass (i=1 spf=pass spfdomain=salutedevices.com dkim=pass dkdomain=salutedevices.com dmarc=pass fromdomain=salutedevices.com); spf=pass (google.com: domain of linux-kernel+bounces-88467-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88467-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=salutedevices.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id C1A5AB21CD1 for ; Fri, 1 Mar 2024 13:31:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3940E70CC5; Fri, 1 Mar 2024 13:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="o0FQfcY4" Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90B226D1B5; Fri, 1 Mar 2024 13:30:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.18.73.165 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299812; cv=none; b=ghV/okPLnHlWJW5dx12TYgteAB1rOrgwGfcbxDyyE6HUPRga8kQJvEYq5oIPNBCKDVydWXoIlYyZHVILodLJgP4RC1po9mDM1NYhYJghr9nBjjfUcY7X9P97nIe23OmunVB713kB2NwxW7gpEDWE7H/UqAgKHYfunWJ+FNxdzfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709299812; c=relaxed/simple; bh=1ucbrpjm5ioPxH/Q3Ey3oht1OlzGrmAXArKrJSAFbSY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o5dUrMzO54TMZMyvq+1EBZdJxJpBBSQYPtL6Uqpq7/KkEXKoVT7pPdTWpcZKoRc9OiFBqMcQ32ufWuQtiXHYcgWxmztHeJF2D7QsMxjOH3zpECxWtjZq62kEVaaSdCInoV6zgF2mB5zVrsB/MJT/CqWqdM52L9Hc8MKz/FoOTeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=o0FQfcY4; arc=none smtp.client-ip=37.18.73.165 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 244D01000E1; Fri, 1 Mar 2024 16:30:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 244D01000E1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1709299807; bh=WE/zZwdFVN3vK0ruTtDHdqty2Ucp8AxmvVeoKM60cVo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=o0FQfcY4oFizHjJdglXejF9vD1Z1kYmn4RjmzYQDEWhmbqc6O/cntKYWfuCugyHky CMSu8rVdGijp63GMidFb/GkTCYs11sHfAPBSr6WuZ1MNDSYLFuanQe9UdofIRJvs6W JT2U/a7Gy2AdiFCqMIM67uUtwcGY1JhXB2VlrDgwAkLOKMVpNNBluHfeR3NFPnm70A T0LfwBzRqNY8E+MzwljH2UTlhh5Tj2udjIYqQMW82PPCG8Tbe6TOCraeO1GPjf4XHk MHJdAorNQJ84MDgz92qZhThm4XZSrRGxdk330EimYon5GrqPwHUan/K2YhyNHFKC0L DyluOthF+jUUQ== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 1 Mar 2024 16:30:07 +0300 (MSK) Received: from user-A520M-DS3H.sigma.sbrf.ru (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 1 Mar 2024 16:30:06 +0300 From: Alexey Romanov To: , , , , , , , , , , CC: , , , , , , Alexey Romanov Subject: [PATCH v5 05/21] drivers: crypto: meson: move get_engine_number() Date: Fri, 1 Mar 2024 16:29:20 +0300 Message-ID: <20240301132936.621238-6-avromanov@salutedevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301132936.621238-1-avromanov@salutedevices.com> References: <20240301132936.621238-1-avromanov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 183875 [Feb 29 2024] X-KSMG-AntiSpam-Version: 6.1.0.3 X-KSMG-AntiSpam-Envelope-From: avromanov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 7 0.3.7 6d6bf5bd8eea7373134f756a2fd73e9456bb7d1a, {Tracking_from_domain_doesnt_match_to}, FromAlignment: s, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2024/02/29 19:21:00 #23899999 X-KSMG-AntiVirus-Status: Clean, skipped X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792330893321496956 X-GMAIL-MSGID: 1792330893321496956 Move get_engine_number() function from cipher.c to core.c Signed-off-by: Alexey Romanov Reviewed-by: Neil Armstrong --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 9 ++------- drivers/crypto/amlogic/amlogic-gxl-core.c | 5 +++++ drivers/crypto/amlogic/amlogic-gxl.h | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c index 1fe916b0a138..18e9e2d39b1f 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -17,11 +17,6 @@ #include #include "amlogic-gxl.h" -static int get_engine_number(struct meson_dev *mc) -{ - return atomic_inc_return(&mc->flow) % mc->flow_cnt; -} - static bool meson_cipher_need_fallback(struct skcipher_request *areq) { struct scatterlist *src_sg = areq->src; @@ -282,7 +277,7 @@ int meson_skdecrypt(struct skcipher_request *areq) rctx->op_dir = MESON_DECRYPT; if (meson_cipher_need_fallback(areq)) return meson_cipher_do_fallback(areq); - e = get_engine_number(op->mc); + e = meson_get_engine_number(op->mc); engine = op->mc->chanlist[e].engine; rctx->flow = e; @@ -300,7 +295,7 @@ int meson_skencrypt(struct skcipher_request *areq) rctx->op_dir = MESON_ENCRYPT; if (meson_cipher_need_fallback(areq)) return meson_cipher_do_fallback(areq); - e = get_engine_number(op->mc); + e = meson_get_engine_number(op->mc); engine = op->mc->chanlist[e].engine; rctx->flow = e; diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c index 70c2433c56da..467468a8a05e 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-core.c +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c @@ -23,6 +23,11 @@ #include "amlogic-gxl.h" +int meson_get_engine_number(struct meson_dev *mc) +{ + return atomic_inc_return(&mc->flow) % mc->flow_cnt; +} + void meson_dma_start(struct meson_dev *mc, int flow) { u32 offset = (mc->pdata->descs_reg + flow) << 2; diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h index 8670f7ebcdda..dc54bd533a2d 100644 --- a/drivers/crypto/amlogic/amlogic-gxl.h +++ b/drivers/crypto/amlogic/amlogic-gxl.h @@ -161,6 +161,8 @@ struct meson_alg_template { #endif }; +int meson_get_engine_number(struct meson_dev *mc); + void meson_dma_start(struct meson_dev *mc, int flow); int meson_enqueue(struct crypto_async_request *areq, u32 type);