From nobody Sun Nov 24 02:37:28 2024 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 2CA4A1E633C; Fri, 8 Nov 2024 10:29:43 +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=1731061785; cv=none; b=pMU/hm0KKX6Uk+J/Lia+Z9m/1q9nozJ7vc+NnaKLWsy4rR31seqlkVOVzUnslxDrxaEVjjt2JaUalkmVFlahjJwD+m1/O2fSkZ55Y+QhTPYyxZ5ksyrFXQP8bQ0JGHrrMSg+I8wJlxztfeEbZrlD5vCpPaTuf/JXYx9xkPW4S4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731061785; c=relaxed/simple; bh=Cjqy427cUfvHXEb9AsmhGUL1O5XdJ/flrXq5QId2WVI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZjNREQO6jgco8mbzjbAChoinwbglNLaxX2DHCZ3boqlzRb93ouII8Ck0MAob7sN+o5VsWx2bfwJ1Fqk4scB9loMBzrxsXtqZwHda5lQaYTeUjifROKRW/22j5lTe3WGG2/rtz87Lf61wThhImNuDI8YuXysg+XVIcZQbO77R4bY= 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=F38UWz2Y; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="F38UWz2Y" Received: from p-infra-ksmg-sc-msk01.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id A003B10002D; Fri, 8 Nov 2024 13:29:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru A003B10002D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1731061781; bh=83vudHhxDif9SBLjlnz2qhLN0U09BQVPw31IzaMiGGU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=F38UWz2YyEWxyz0wbfEFAEmZlHMPd2yOwRYoW0RQrZ0FPJVzXPEf6OjYbW6wy/oIx UiskohzyPeq01mYWMAlafkhTBcOliTmAifCrz1aEV7nXVd2huIp6jVRHZFaQ+XWzLr sm0m45hBmijXvMMaPbkmvAbYK/8IsrGovYLIv+azqn9BdydniiOjbfnsF45/qz+yg+ v+WYQv/FxbglNan6d28xHBKWuqsQSR7CDR69x4wPjCIUDstmmZ9o7WVzmArEZ/4E4y Cz+Wbuwi5Ns72wTOvjPc5nClo0+3sWnE8YDdPyBLUZei+rgRT9H9477koo8oOeIiBD OlQxpqx17f/hQ== 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, 8 Nov 2024 13:29:41 +0300 (MSK) From: Alexey Romanov To: , , , , , , , , , , , CC: , , , , , , "Alexey Romanov" Subject: [PATCH v10 08/22] crypto: amlogic - Cleanup defines Date: Fri, 8 Nov 2024 13:28:53 +0300 Message-ID: <20241108102907.1788584-9-avromanov@salutedevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108102907.1788584-1-avromanov@salutedevices.com> References: <20241108102907.1788584-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-a-m2.sberdevices.ru (172.24.196.120) To p-i-exch-a-m1.sberdevices.ru (172.24.196.116) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 189039 [Nov 08 2024] X-KSMG-AntiSpam-Version: 6.1.1.7 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: 41 0.3.41 623e98d5198769c015c72f45fabbb9f77bdb702b, {Tracking_from_domain_doesnt_match_to}, smtp.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;salutedevices.com:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s 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/11/08 08:34:00 #26834472 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" It is bad to use hardcoded values directly in the code. Signed-off-by: Alexey Romanov Reviewed-by: Neil Armstrong --- 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 bc3092a8a2c2..c662c4b86e97 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; @@ -348,14 +348,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); @@ -373,7 +373,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.base =3D { .base =3D { .cra_name =3D "cbc(aes)", @@ -402,7 +402,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.base =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 f0ccd28545aa..8f20903842ec 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 GENMASK(16, 0) + #define DESC_LAST BIT(18) #define DESC_ENCRYPTION BIT(28) #define DESC_OWN BIT(31) --=20 2.34.1