From nobody Fri Dec 26 01:24:22 2025 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) (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 E4CB84EB25; Wed, 10 Jan 2024 20:12:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="U6ZNtJG1" Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 561C7120021; Wed, 10 Jan 2024 23:12:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 561C7120021 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1704917553; bh=DQ6lH/EiQy2rAiRAbqolg3UtV5ayr3vMdl5UlzBCUbw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=U6ZNtJG11tpo4mngNfnK7KWZ+GwPdEAGf0Wwq2aku/vXhKf5t16no17uMbVTE0GPC nrovyMJoPiHRqI0sb4CEVOwbWuaI5h5aFrxyAad6g9V4m2i6ApD5VQ28SPhAloKIlm knbK5ceBnR42YtLSRquyqQTaYVhNQAJYwg2ttJPaoqWXXF+wC5pirkDPj4FSXkeatl 13WNSs36E60TLB38J/myyGVJB2J3G15mkVPQvpB85Xy0X9tJiFZss8ZXPyQVTP1Tt3 smB3YD54IbdjjI0WZQb1gsKu9xwtbofrwOo/FWSiC1vk4hVeRrLK5w+DDNiqGRQe3t 2q4Os7TcG9E+Q== 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; Wed, 10 Jan 2024 23:12:33 +0300 (MSK) Received: from localhost.localdomain (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; Wed, 10 Jan 2024 23:12:32 +0300 From: Alexey Romanov To: , , , , , , , , , , CC: , , , , , , Jan Dakinevich , Alexey Romanov Subject: [PATCH v1 08/24] drivers: crypto: meson: cleanup defines Date: Wed, 10 Jan 2024 23:11:24 +0300 Message-ID: <20240110201216.18016-9-avromanov@salutedevices.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110201216.18016-1-avromanov@salutedevices.com> References: <20240110201216.18016-1-avromanov@salutedevices.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) 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: 182544 [Jan 10 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}, 100.64.160.123:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;salutedevices.com:7.1.1;127.0.0.199:7.1.2;smtp.sberdevices.ru:5.0.1,7.1.1, 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/01/10 17:01:00 #23071477 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" From: Jan Dakinevich It is bad to use hardcoded values directly in the code. Signed-off-by: Jan Dakinevich Signed-off-by: Alexey Romanov --- drivers/crypto/amlogic/amlogic-gxl-cipher.c | 24 ++++++++++----------- drivers/crypto/amlogic/amlogic-gxl.h | 16 ++++++++------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/a= mlogic/amlogic-gxl-cipher.c index d2f39bd97486..389f6aea7c25 100644 --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c @@ -141,8 +141,8 @@ static int meson_cipher(struct skcipher_request *areq) ivsize, 0); } } - if (keyivlen =3D=3D 24) - keyivlen =3D 32; + if (keyivlen =3D=3D AES_KEYSIZE_192) + keyivlen =3D AES_MAX_KEY_SIZE; =20 phykeyiv =3D dma_map_single(mc->dev, bkeyiv, keyivlen, DMA_TO_DEVICE); @@ -161,7 +161,7 @@ static int meson_cipher(struct skcipher_request *areq) todo =3D min(keyivlen - eat, 16u); desc->t_src =3D cpu_to_le32(phykeyiv + i * 16); desc->t_dst =3D cpu_to_le32(i * 16); - v =3D (MODE_KEY << 20) | DESC_OWN | 16; + v =3D DESC_MODE_KEY | DESC_OWN | 16; desc->t_status =3D cpu_to_le32(v); =20 eat +=3D todo; @@ -205,7 +205,7 @@ static int meson_cipher(struct skcipher_request *areq) desc->t_src =3D cpu_to_le32(sg_dma_address(src_sg)); desc->t_dst =3D cpu_to_le32(sg_dma_address(dst_sg)); todo =3D min(len, sg_dma_len(src_sg)); - v =3D (op->keymode << 20) | DESC_OWN | todo | (algt->blockmode << 26); + v =3D op->keymode | DESC_OWN | todo | algt->blockmode; if (rctx->op_dir) v |=3D DESC_ENCRYPTION; len -=3D todo; @@ -353,14 +353,14 @@ static int meson_aes_setkey(struct crypto_skcipher *t= fm, const u8 *key, struct meson_dev *mc =3D op->mc; =20 switch (keylen) { - case 128 / 8: - op->keymode =3D MODE_AES_128; + case AES_KEYSIZE_128: + op->keymode =3D DESC_MODE_AES_128; break; - case 192 / 8: - op->keymode =3D MODE_AES_192; + case AES_KEYSIZE_192: + op->keymode =3D DESC_MODE_AES_192; break; - case 256 / 8: - op->keymode =3D MODE_AES_256; + case AES_KEYSIZE_256: + op->keymode =3D DESC_MODE_AES_256; break; default: dev_dbg(mc->dev, "ERROR: Invalid keylen %u\n", keylen); @@ -378,7 +378,7 @@ static int meson_aes_setkey(struct crypto_skcipher *tfm= , const u8 *key, static struct meson_alg_template algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .blockmode =3D MESON_OPMODE_CBC, + .blockmode =3D DESC_OPMODE_CBC, .alg.skcipher =3D { .base =3D { .cra_name =3D "cbc(aes)", @@ -404,7 +404,7 @@ static struct meson_alg_template algs[] =3D { }, { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .blockmode =3D MESON_OPMODE_ECB, + .blockmode =3D DESC_OPMODE_ECB, .alg.skcipher =3D { .base =3D { .cra_name =3D "ecb(aes)", diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/= amlogic-gxl.h index 1e6ec5790750..8e28adc57d39 100644 --- a/drivers/crypto/amlogic/amlogic-gxl.h +++ b/drivers/crypto/amlogic/amlogic-gxl.h @@ -11,19 +11,21 @@ #include #include =20 -#define MODE_KEY 1 -#define MODE_AES_128 0x8 -#define MODE_AES_192 0x9 -#define MODE_AES_256 0xa - #define MESON_DECRYPT 0 #define MESON_ENCRYPT 1 =20 -#define MESON_OPMODE_ECB 0 -#define MESON_OPMODE_CBC 1 +#define DESC_MODE_KEY (0x1 << 20) +#define DESC_MODE_AES_128 (0x8 << 20) +#define DESC_MODE_AES_192 (0x9 << 20) +#define DESC_MODE_AES_256 (0xa << 20) =20 #define MAXDESC 64 =20 +#define DESC_OPMODE_ECB (0 << 26) +#define DESC_OPMODE_CBC (1 << 26) + +#define DESC_MAXLEN ((1 << 17) - 1) + #define DESC_LAST BIT(18) #define DESC_ENCRYPTION BIT(28) #define DESC_OWN BIT(31) --=20 2.30.1