From: Alexey Romanov <avromanov@salutedevices.com>
To: <neil.armstrong@linaro.org>, <clabbe@baylibre.com>,
<herbert@gondor.apana.org.au>, <davem@davemloft.net>,
<robh+dt@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>,
<conor+dt@kernel.org>, <khilman@baylibre.com>,
<jbrunet@baylibre.com>, <martin.blumenstingl@googlemail.com>,
<vadim.fedorenko@linux.dev>
Cc: <linux-crypto@vger.kernel.org>,
<linux-amlogic@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<kernel@salutedevices.com>,
Alexey Romanov <avromanov@salutedevices.com>
Subject: [PATCH v7 08/23] drivers: crypto: meson: cleanup defines
Date: Thu, 11 Apr 2024 16:38:17 +0300 [thread overview]
Message-ID: <20240411133832.2896463-9-avromanov@salutedevices.com> (raw)
In-Reply-To: <20240411133832.2896463-1-avromanov@salutedevices.com>
It is bad to use hardcoded values directly in the code.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
---
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/amlogic/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 == 24)
- keyivlen = 32;
+ if (keyivlen == AES_KEYSIZE_192)
+ keyivlen = AES_MAX_KEY_SIZE;
phykeyiv = dma_map_single(mc->dev, bkeyiv, keyivlen,
DMA_TO_DEVICE);
@@ -161,7 +161,7 @@ static int meson_cipher(struct skcipher_request *areq)
todo = min(keyivlen - eat, 16u);
desc->t_src = cpu_to_le32(phykeyiv + i * 16);
desc->t_dst = cpu_to_le32(i * 16);
- v = (MODE_KEY << 20) | DESC_OWN | 16;
+ v = DESC_MODE_KEY | DESC_OWN | 16;
desc->t_status = cpu_to_le32(v);
eat += todo;
@@ -205,7 +205,7 @@ static int meson_cipher(struct skcipher_request *areq)
desc->t_src = cpu_to_le32(sg_dma_address(src_sg));
desc->t_dst = cpu_to_le32(sg_dma_address(dst_sg));
todo = min(len, sg_dma_len(src_sg));
- v = (op->keymode << 20) | DESC_OWN | todo | (algt->blockmode << 26);
+ v = op->keymode | DESC_OWN | todo | algt->blockmode;
if (rctx->op_dir)
v |= DESC_ENCRYPTION;
len -= todo;
@@ -348,14 +348,14 @@ static int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
struct meson_dev *mc = op->mc;
switch (keylen) {
- case 128 / 8:
- op->keymode = MODE_AES_128;
+ case AES_KEYSIZE_128:
+ op->keymode = DESC_MODE_AES_128;
break;
- case 192 / 8:
- op->keymode = MODE_AES_192;
+ case AES_KEYSIZE_192:
+ op->keymode = DESC_MODE_AES_192;
break;
- case 256 / 8:
- op->keymode = MODE_AES_256;
+ case AES_KEYSIZE_256:
+ op->keymode = 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[] = {
{
.type = CRYPTO_ALG_TYPE_SKCIPHER,
- .blockmode = MESON_OPMODE_CBC,
+ .blockmode = DESC_OPMODE_CBC,
.alg.skcipher.base = {
.base = {
.cra_name = "cbc(aes)",
@@ -402,7 +402,7 @@ static struct meson_alg_template algs[] = {
},
{
.type = CRYPTO_ALG_TYPE_SKCIPHER,
- .blockmode = MESON_OPMODE_ECB,
+ .blockmode = DESC_OPMODE_ECB,
.alg.skcipher.base = {
.base = {
.cra_name = "ecb(aes)",
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 9d66903aa73d..1ab3462dea42 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -11,19 +11,21 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
-#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
-#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)
#define MAXDESC 64
+#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)
--
2.34.1
next prev parent reply other threads:[~2024-04-11 13:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 13:38 [PATCH v7 00/23] Support more Amlogic SoC families in crypto driver Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 01/23] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 02/23] drviers: crypto: meson: add platform data Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 03/23] drivers: crypto: meson: remove clock input Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 04/23] drivers: crypto: meson: add MMIO helpers Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 05/23] drivers: crypto: meson: move get_engine_number() Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 06/23] drivers: crypto: meson: drop status field from meson_flow Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 07/23] drivers: crypto: meson: move algs definition and cipher API to cipher.c Alexey Romanov
2024-04-11 13:38 ` Alexey Romanov [this message]
2024-04-11 13:38 ` [PATCH v7 09/23] drivers: crypto: meson: process more than MAXDESCS descriptors Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 10/23] drivers: crypto: meson: avoid kzalloc in engine thread Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 11/23] drivers: crypto: meson: introduce hasher Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 12/23] drivers: crypto: meson: add support for AES-CTR Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 13/23] drivers: crypto: meson: use fallback for 192-bit keys Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 14/23] drivers: crypto: meson: add support for G12-series Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 15/23] drivers: crypto: meson: add support for AXG-series Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 16/23] drivers: crypto: meson: add support for A1-series Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 17/23] dt-bindings: crypto: meson: remove clk and second interrupt line for GXL Alexey Romanov
2024-04-15 16:43 ` Conor Dooley
2024-05-06 13:48 ` Alexey Romanov
2024-05-06 15:47 ` Conor Dooley
2024-05-23 10:46 ` Alexey Romanov
2024-05-23 14:37 ` Conor Dooley
2024-04-11 13:38 ` [PATCH v7 18/23] arch: arm64: dts: meson: gxl: correct crypto node definition Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 19/23] dt-bindings: crypto: meson: support new SoC's Alexey Romanov
2024-04-15 16:44 ` Conor Dooley
2024-04-11 13:38 ` [PATCH v7 20/23] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 21/23] arch: arm64: dts: meson: s4: " Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 22/23] arch: arm64: dts: meson: g12: " Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 23/23] arch: arm64: dts: meson: axg: " Alexey Romanov
2024-04-12 2:53 ` [PATCH v7 00/23] Support more Amlogic SoC families in crypto driver Herbert Xu
2024-04-12 8:19 ` Alexey Romanov
2024-04-12 8:22 ` Herbert Xu
2024-04-12 8:25 ` Alexey Romanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240411133832.2896463-9-avromanov@salutedevices.com \
--to=avromanov@salutedevices.com \
--cc=clabbe@baylibre.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=jbrunet@baylibre.com \
--cc=kernel@salutedevices.com \
--cc=khilman@baylibre.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=neil.armstrong@linaro.org \
--cc=robh+dt@kernel.org \
--cc=vadim.fedorenko@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).