* [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
@ 2024-01-10 20:11 Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
` (25 more replies)
0 siblings, 26 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
Hello!
This patchset expand the funcionality of the Amlogic
crypto driver by adding support for more SoC families:
AXG, G12A, G12B, SM1, A1, S4.
Also specify and enable crypto node in device tree
for reference Amlogic devices.
Tested on AXG, G12A/B, SM1, A1 and S4 devices via
custom tests and trcypt module.
Alexey Romanov (17):
drivers: crypto: meson: don't hardcode IRQ count
drivers: crypto: meson: make CLK controller optional
drviers: crypto: meson: add platform data
drivers: crypto: meson: add MMIO helpers
drivers: crypto: meson: move get_engine_number()
drivers: crypto: meson: use fallback for 192-bit keys
drivers: crypto: meson: add support for G12-series
drivers: crypto: meson: add support for AXG-series
dt-bindings: crypto: meson: add new compatibles
arch: arm64: dts: meson: a1: add crypto node
arch: arm64: dts: meson: s4: add crypto node
arch: arm64: dts: meson: g12: add crypto node
arch: arm64: dts: meson: axg: add crypto node
arch: arm64: dts: meson: s4-s805x2-aq222: enable crypto node
arch: arm64: dts: meson: a1-ad401: enable crypto node
arch: arm64: dts: meson: axg-s400: enable crypto node
arch: arm64: dts: meson: g12a-u200: enable crypto node
Jan Dakinevich (7):
drivers: crypto: meson: drop status field from meson_flow
drivers: crypto: meson: move algs definition and cipher API to
cipher.c
drivers: crypto: meson: cleanup defines
drivers: crypto: meson: process more than MAXDESCS descriptors
drivers: crypto: meson: avoid kzalloc in engine thread
drivers: crypto: meson: introduce hasher
drivers: crypto: meson: add support for AES-CTR
.../bindings/crypto/amlogic,gxl-crypto.yaml | 2 +
.../arm64/boot/dts/amlogic/meson-a1-ad401.dts | 4 +
arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 8 +
.../arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 7 +
.../boot/dts/amlogic/meson-g12-common.dtsi | 7 +
.../boot/dts/amlogic/meson-g12a-u200.dts | 4 +
.../dts/amlogic/meson-s4-s805x2-aq222.dts | 4 +
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 7 +
drivers/crypto/amlogic/Makefile | 2 +-
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 591 ++++++++++++------
drivers/crypto/amlogic/amlogic-gxl-core.c | 260 ++++----
drivers/crypto/amlogic/amlogic-gxl-hasher.c | 448 +++++++++++++
drivers/crypto/amlogic/amlogic-gxl.h | 116 +++-
14 files changed, 1135 insertions(+), 329 deletions(-)
create mode 100644 drivers/crypto/amlogic/amlogic-gxl-hasher.c
--
2.30.1
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-11 8:21 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 02/24] drivers: crypto: meson: make CLK controller optional Alexey Romanov
` (24 subsequent siblings)
25 siblings, 1 reply; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov, Jan Dakinevich
IRQ count is no longer hardcoded, and make it part of
struct meson_flow. We need this for extend driver support for
other Amlogic SoC's.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +-
drivers/crypto/amlogic/amlogic-gxl-core.c | 47 ++++++++++++---------
drivers/crypto/amlogic/amlogic-gxl.h | 8 ++--
3 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index af017a087ebf..e01ed6347c3d 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -19,7 +19,7 @@
static int get_engine_number(struct meson_dev *mc)
{
- return atomic_inc_return(&mc->flow) % MAXFLOW;
+ return atomic_inc_return(&mc->flow) % mc->flow_cnt;
}
static bool meson_cipher_need_fallback(struct skcipher_request *areq)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index 937187027ad5..a5df061f9890 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -26,8 +26,8 @@ static irqreturn_t meson_irq_handler(int irq, void *data)
int flow;
u32 p;
- for (flow = 0; flow < MAXFLOW; flow++) {
- if (mc->irqs[flow] == irq) {
+ for (flow = 0; flow < mc->flow_cnt; flow++) {
+ if (mc->chanlist[flow].irq == irq) {
p = readl(mc->base + ((0x04 + flow) << 2));
if (p) {
writel_relaxed(0xF, mc->base + ((0x4 + flow) << 2));
@@ -103,7 +103,7 @@ static int meson_debugfs_show(struct seq_file *seq, void *v)
struct meson_dev *mc = seq->private;
int i;
- for (i = 0; i < MAXFLOW; i++)
+ for (i = 0; i < mc->flow_cnt; i++)
seq_printf(seq, "Channel %d: nreq %lu\n", i, mc->chanlist[i].stat_req);
for (i = 0; i < ARRAY_SIZE(mc_algs); i++) {
@@ -138,14 +138,32 @@ static void meson_free_chanlist(struct meson_dev *mc, int i)
*/
static int meson_allocate_chanlist(struct meson_dev *mc)
{
+ struct platform_device *pdev = to_platform_device(mc->dev);
int i, err;
- mc->chanlist = devm_kcalloc(mc->dev, MAXFLOW,
+ mc->flow_cnt = platform_irq_count(pdev);
+ if (mc->flow_cnt <= 0) {
+ dev_err(mc->dev, "No IRQs defined\n");
+ return -ENODEV;
+ }
+
+ mc->chanlist = devm_kcalloc(mc->dev, mc->flow_cnt,
sizeof(struct meson_flow), GFP_KERNEL);
if (!mc->chanlist)
return -ENOMEM;
- for (i = 0; i < MAXFLOW; i++) {
+ for (i = 0; i < mc->flow_cnt; i++) {
+ mc->chanlist[i].irq = platform_get_irq(pdev, i);
+ if (mc->chanlist[i].irq < 0)
+ return mc->chanlist[i].irq;
+
+ err = devm_request_irq(mc->dev, mc->chanlist[i].irq,
+ meson_irq_handler, 0, "aml-crypto", mc);
+ if (err < 0) {
+ dev_err(mc->dev, "Cannot request IRQ for flow %d\n", i);
+ return err;
+ }
+
init_completion(&mc->chanlist[i].complete);
mc->chanlist[i].engine = crypto_engine_alloc_init(mc->dev, true);
@@ -215,7 +233,7 @@ static void meson_unregister_algs(struct meson_dev *mc)
static int meson_crypto_probe(struct platform_device *pdev)
{
struct meson_dev *mc;
- int err, i;
+ int err;
mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
if (!mc)
@@ -237,19 +255,6 @@ static int meson_crypto_probe(struct platform_device *pdev)
return err;
}
- for (i = 0; i < MAXFLOW; i++) {
- mc->irqs[i] = platform_get_irq(pdev, i);
- if (mc->irqs[i] < 0)
- return mc->irqs[i];
-
- err = devm_request_irq(&pdev->dev, mc->irqs[i], meson_irq_handler, 0,
- "gxl-crypto", mc);
- if (err < 0) {
- dev_err(mc->dev, "Cannot request IRQ for flow %d\n", i);
- return err;
- }
- }
-
err = clk_prepare_enable(mc->busclk);
if (err != 0) {
dev_err(&pdev->dev, "Cannot prepare_enable busclk\n");
@@ -273,7 +278,7 @@ static int meson_crypto_probe(struct platform_device *pdev)
error_alg:
meson_unregister_algs(mc);
error_flow:
- meson_free_chanlist(mc, MAXFLOW - 1);
+ meson_free_chanlist(mc, mc->flow_cnt - 1);
clk_disable_unprepare(mc->busclk);
return err;
}
@@ -288,7 +293,7 @@ static int meson_crypto_remove(struct platform_device *pdev)
meson_unregister_algs(mc);
- meson_free_chanlist(mc, MAXFLOW - 1);
+ meson_free_chanlist(mc, mc->flow_cnt - 1);
clk_disable_unprepare(mc->busclk);
return 0;
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 8c0746a1d6d4..e5cc6e028fa8 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -22,8 +22,6 @@
#define MESON_OPMODE_ECB 0
#define MESON_OPMODE_CBC 1
-#define MAXFLOW 2
-
#define MAXDESC 64
#define DESC_LAST BIT(18)
@@ -62,6 +60,7 @@ struct meson_desc {
* @keylen: keylen for this flow operation
* @complete: completion for the current task on this flow
* @status: set to 1 by interrupt if task is done
+ * @irq: IRQ number for amlogic-crypto
* @t_phy: Physical address of task
* @tl: pointer to the current ce_task for this flow
* @stat_req: number of request done by this flow
@@ -70,6 +69,7 @@ struct meson_flow {
struct crypto_engine *engine;
struct completion complete;
int status;
+ int irq;
unsigned int keylen;
dma_addr_t t_phy;
struct meson_desc *tl;
@@ -85,7 +85,7 @@ struct meson_flow {
* @dev: the platform device
* @chanlist: array of all flow
* @flow: flow to use in next request
- * @irqs: IRQ numbers for amlogic-crypto
+ * @flow_cnt: flow count for amlogic-crypto
* @dbgfs_dir: Debugfs dentry for statistic directory
* @dbgfs_stats: Debugfs dentry for statistic counters
*/
@@ -95,7 +95,7 @@ struct meson_dev {
struct device *dev;
struct meson_flow *chanlist;
atomic_t flow;
- int irqs[MAXFLOW];
+ int flow_cnt;
#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
struct dentry *dbgfs_dir;
#endif
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 02/24] drivers: crypto: meson: make CLK controller optional
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-11 8:20 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 03/24] drviers: crypto: meson: add platform data Alexey Romanov
` (23 subsequent siblings)
25 siblings, 1 reply; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov, Jan Dakinevich
Not all Amlogic SoC's uses CLK controller.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-core.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index a5df061f9890..e5f504fb477e 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -248,16 +248,10 @@ static int meson_crypto_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Cannot request MMIO err=%d\n", err);
return err;
}
- mc->busclk = devm_clk_get(&pdev->dev, "blkmv");
+ mc->busclk = devm_clk_get_optional_enabled(&pdev->dev, "blkmv");
if (IS_ERR(mc->busclk)) {
err = PTR_ERR(mc->busclk);
- dev_err(&pdev->dev, "Cannot get core clock err=%d\n", err);
- return err;
- }
-
- err = clk_prepare_enable(mc->busclk);
- if (err != 0) {
- dev_err(&pdev->dev, "Cannot prepare_enable busclk\n");
+ dev_err(&pdev->dev, "Cannot get and enable core clock err=%d\n", err);
return err;
}
@@ -279,7 +273,6 @@ static int meson_crypto_probe(struct platform_device *pdev)
meson_unregister_algs(mc);
error_flow:
meson_free_chanlist(mc, mc->flow_cnt - 1);
- clk_disable_unprepare(mc->busclk);
return err;
}
@@ -295,7 +288,6 @@ static int meson_crypto_remove(struct platform_device *pdev)
meson_free_chanlist(mc, mc->flow_cnt - 1);
- clk_disable_unprepare(mc->busclk);
return 0;
}
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 03/24] drviers: crypto: meson: add platform data
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 02/24] drivers: crypto: meson: make CLK controller optional Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 04/24] drivers: crypto: meson: add MMIO helpers Alexey Romanov
` (22 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov, Jan Dakinevich
To support other Amlogic SoC's we have to
use platform data: descriptors and status registers
offsets are individual for each SoC series.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +-
drivers/crypto/amlogic/amlogic-gxl-core.c | 30 +++++++++++++++------
drivers/crypto/amlogic/amlogic-gxl.h | 11 ++++++++
3 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index e01ed6347c3d..58de925caae7 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -225,7 +225,7 @@ static int meson_cipher(struct skcipher_request *areq)
reinit_completion(&mc->chanlist[flow].complete);
mc->chanlist[flow].status = 0;
- writel(mc->chanlist[flow].t_phy | 2, mc->base + (flow << 2));
+ writel(mc->chanlist[flow].t_phy | 2, mc->base + ((mc->pdata->descs_reg + flow) << 2));
wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete,
msecs_to_jiffies(500));
if (mc->chanlist[flow].status == 0) {
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index e5f504fb477e..a83c00922b48 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -28,9 +28,10 @@ static irqreturn_t meson_irq_handler(int irq, void *data)
for (flow = 0; flow < mc->flow_cnt; flow++) {
if (mc->chanlist[flow].irq == irq) {
- p = readl(mc->base + ((0x04 + flow) << 2));
+ p = readl(mc->base + ((mc->pdata->status_reg + flow) << 2));
if (p) {
- writel_relaxed(0xF, mc->base + ((0x4 + flow) << 2));
+ writel_relaxed(0xF, mc->base +
+ ((mc->pdata->status_reg + flow) << 2));
mc->chanlist[flow].status = 1;
complete(&mc->chanlist[flow].complete);
return IRQ_HANDLED;
@@ -230,15 +231,34 @@ static void meson_unregister_algs(struct meson_dev *mc)
}
}
+static const struct meson_pdata meson_gxl_pdata = {
+ .descs_reg = 0x0,
+ .status_reg = 0x4,
+};
+
+static const struct of_device_id meson_crypto_of_match_table[] = {
+ {
+ .compatible = "amlogic,gxl-crypto",
+ .data = &meson_gxl_pdata,
+ },
+ {},
+};
+
static int meson_crypto_probe(struct platform_device *pdev)
{
+ const struct of_device_id *match;
struct meson_dev *mc;
int err;
+ match = of_match_device(meson_crypto_of_match_table, &pdev->dev);
+ if (!match)
+ return -EINVAL;
+
mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
if (!mc)
return -ENOMEM;
+ mc->pdata = match->data;
mc->dev = &pdev->dev;
platform_set_drvdata(pdev, mc);
@@ -291,12 +311,6 @@ static int meson_crypto_remove(struct platform_device *pdev)
return 0;
}
-static const struct of_device_id meson_crypto_of_match_table[] = {
- { .compatible = "amlogic,gxl-crypto", },
- {}
-};
-MODULE_DEVICE_TABLE(of, meson_crypto_of_match_table);
-
static struct platform_driver meson_crypto_driver = {
.probe = meson_crypto_probe,
.remove = meson_crypto_remove,
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index e5cc6e028fa8..c8ba726ccc8b 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -78,6 +78,16 @@ struct meson_flow {
#endif
};
+/*
+ * struct meson_pdata - SoC series dependent data.
+ * @reg_descs: offset to descriptors register
+ * @reg_status: offset to status register
+ */
+struct meson_pdata {
+ u32 descs_reg;
+ u32 status_reg;
+};
+
/*
* struct meson_dev - main container for all this driver information
* @base: base address of amlogic-crypto
@@ -93,6 +103,7 @@ struct meson_dev {
void __iomem *base;
struct clk *busclk;
struct device *dev;
+ const struct meson_pdata *pdata;
struct meson_flow *chanlist;
atomic_t flow;
int flow_cnt;
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 04/24] drivers: crypto: meson: add MMIO helpers
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (2 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 03/24] drviers: crypto: meson: add platform data Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 05/24] drivers: crypto: meson: move get_engine_number() Alexey Romanov
` (21 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov, Jan Dakinevich
Add MMIO access helpers: meson_dma_start() and meson_dma_ready().
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +-
drivers/crypto/amlogic/amlogic-gxl-core.c | 24 ++++++++++++++++-----
drivers/crypto/amlogic/amlogic-gxl.h | 2 ++
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index 58de925caae7..7ea88a9f78a5 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -225,7 +225,7 @@ static int meson_cipher(struct skcipher_request *areq)
reinit_completion(&mc->chanlist[flow].complete);
mc->chanlist[flow].status = 0;
- writel(mc->chanlist[flow].t_phy | 2, mc->base + ((mc->pdata->descs_reg + flow) << 2));
+ meson_dma_start(mc, flow);
wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete,
msecs_to_jiffies(500));
if (mc->chanlist[flow].status == 0) {
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index a83c00922b48..78b70c17862d 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -20,18 +20,32 @@
#include "amlogic-gxl.h"
+void meson_dma_start(struct meson_dev *mc, int flow)
+{
+ u32 offset = (mc->pdata->descs_reg + flow) << 2;
+
+ writel(mc->chanlist[flow].t_phy | 2, mc->base + offset);
+}
+
+static bool meson_dma_ready(struct meson_dev *mc, int flow)
+{
+ u32 offset = (mc->pdata->status_reg + flow) << 2;
+ u32 data = readl(mc->base + offset);
+
+ if (data)
+ writel_relaxed(0xF, mc->base + offset);
+
+ return data;
+}
+
static irqreturn_t meson_irq_handler(int irq, void *data)
{
struct meson_dev *mc = (struct meson_dev *)data;
int flow;
- u32 p;
for (flow = 0; flow < mc->flow_cnt; flow++) {
if (mc->chanlist[flow].irq == irq) {
- p = readl(mc->base + ((mc->pdata->status_reg + flow) << 2));
- if (p) {
- writel_relaxed(0xF, mc->base +
- ((mc->pdata->status_reg + flow) << 2));
+ if (meson_dma_ready(mc, flow)) {
mc->chanlist[flow].status = 1;
complete(&mc->chanlist[flow].complete);
return IRQ_HANDLED;
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index c8ba726ccc8b..80b7a2492168 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -163,6 +163,8 @@ struct meson_alg_template {
#endif
};
+void meson_dma_start(struct meson_dev *mc, int flow);
+
int meson_enqueue(struct crypto_async_request *areq, u32 type);
int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 05/24] drivers: crypto: meson: move get_engine_number()
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (3 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 04/24] drivers: crypto: meson: add MMIO helpers Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 06/24] drivers: crypto: meson: drop status field from meson_flow Alexey Romanov
` (20 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov, Jan Dakinevich
Move get_engine_number() function from cipher.c to core.c
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
---
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 7ea88a9f78a5..eb64dc0c0654 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -17,11 +17,6 @@
#include <crypto/internal/skcipher.h>
#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;
@@ -283,7 +278,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;
@@ -301,7 +296,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 78b70c17862d..06330706e49f 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -20,6 +20,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 80b7a2492168..46cc85afb74e 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -163,6 +163,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);
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 06/24] drivers: crypto: meson: drop status field from meson_flow
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (4 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 05/24] drivers: crypto: meson: move get_engine_number() Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 07/24] drivers: crypto: meson: move algs definition and cipher API to cipher.c Alexey Romanov
` (19 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
This field is used only to check for timeout. But there is more
convenient way to achive the same goal.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 13 +++++++++----
drivers/crypto/amlogic/amlogic-gxl-core.c | 1 -
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 eb64dc0c0654..f9a86a11cd70 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -219,13 +219,18 @@ static int meson_cipher(struct skcipher_request *areq)
}
reinit_completion(&mc->chanlist[flow].complete);
- mc->chanlist[flow].status = 0;
meson_dma_start(mc, flow);
- wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete,
- msecs_to_jiffies(500));
- if (mc->chanlist[flow].status == 0) {
+
+ err = wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete,
+ msecs_to_jiffies(500));
+ if (err == 0) {
dev_err(mc->dev, "DMA timeout for flow %d\n", flow);
err = -EINVAL;
+ } else if (err < 0) {
+ dev_err(mc->dev, "Waiting for DMA completion is failed (%d)\n", err);
+ } else {
+ /* No error */
+ err = 0;
}
dma_unmap_single(mc->dev, phykeyiv, keyivlen, DMA_TO_DEVICE);
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index 06330706e49f..ae50ea51c8a0 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -51,7 +51,6 @@ static irqreturn_t meson_irq_handler(int irq, void *data)
for (flow = 0; flow < mc->flow_cnt; flow++) {
if (mc->chanlist[flow].irq == irq) {
if (meson_dma_ready(mc, flow)) {
- mc->chanlist[flow].status = 1;
complete(&mc->chanlist[flow].complete);
return IRQ_HANDLED;
}
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 46cc85afb74e..80ce6cb9baef 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -59,7 +59,6 @@ struct meson_desc {
* @engine: ptr to the crypto_engine for this flow
* @keylen: keylen for this flow operation
* @complete: completion for the current task on this flow
- * @status: set to 1 by interrupt if task is done
* @irq: IRQ number for amlogic-crypto
* @t_phy: Physical address of task
* @tl: pointer to the current ce_task for this flow
@@ -68,7 +67,6 @@ struct meson_desc {
struct meson_flow {
struct crypto_engine *engine;
struct completion complete;
- int status;
int irq;
unsigned int keylen;
dma_addr_t t_phy;
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 07/24] drivers: crypto: meson: move algs definition and cipher API to cipher.c
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (5 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 06/24] drivers: crypto: meson: drop status field from meson_flow Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 08/24] drivers: crypto: meson: cleanup defines Alexey Romanov
` (18 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
Because that is proper place for them. In particular,
it takes less of exported symbol between compiling entities.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 90 ++++++++++++++++--
drivers/crypto/amlogic/amlogic-gxl-core.c | 100 ++++----------------
drivers/crypto/amlogic/amlogic-gxl.h | 14 +--
3 files changed, 111 insertions(+), 93 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index f9a86a11cd70..d2f39bd97486 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -272,7 +272,7 @@ static int meson_handle_cipher_request(struct crypto_engine *engine,
return 0;
}
-int meson_skdecrypt(struct skcipher_request *areq)
+static int meson_skdecrypt(struct skcipher_request *areq)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
@@ -290,7 +290,7 @@ int meson_skdecrypt(struct skcipher_request *areq)
return crypto_transfer_skcipher_request_to_engine(engine, areq);
}
-int meson_skencrypt(struct skcipher_request *areq)
+static int meson_skencrypt(struct skcipher_request *areq)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
@@ -308,7 +308,7 @@ int meson_skencrypt(struct skcipher_request *areq)
return crypto_transfer_skcipher_request_to_engine(engine, areq);
}
-int meson_cipher_init(struct crypto_tfm *tfm)
+static int meson_cipher_init(struct crypto_tfm *tfm)
{
struct meson_cipher_tfm_ctx *op = crypto_tfm_ctx(tfm);
struct meson_alg_template *algt;
@@ -338,7 +338,7 @@ int meson_cipher_init(struct crypto_tfm *tfm)
return 0;
}
-void meson_cipher_exit(struct crypto_tfm *tfm)
+static void meson_cipher_exit(struct crypto_tfm *tfm)
{
struct meson_cipher_tfm_ctx *op = crypto_tfm_ctx(tfm);
@@ -346,8 +346,8 @@ void meson_cipher_exit(struct crypto_tfm *tfm)
crypto_free_skcipher(op->fallback_tfm);
}
-int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
- unsigned int keylen)
+static int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
+ unsigned int keylen)
{
struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
struct meson_dev *mc = op->mc;
@@ -374,3 +374,81 @@ int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
return crypto_skcipher_setkey(op->fallback_tfm, key, keylen);
}
+
+static struct meson_alg_template algs[] = {
+{
+ .type = CRYPTO_ALG_TYPE_SKCIPHER,
+ .blockmode = MESON_OPMODE_CBC,
+ .alg.skcipher = {
+ .base = {
+ .cra_name = "cbc(aes)",
+ .cra_driver_name = "cbc-aes-gxl",
+ .cra_priority = 400,
+ .cra_blocksize = AES_BLOCK_SIZE,
+ .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
+ CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY |
+ CRYPTO_ALG_NEED_FALLBACK,
+ .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx),
+ .cra_module = THIS_MODULE,
+ .cra_alignmask = 0xf,
+ .cra_init = meson_cipher_init,
+ .cra_exit = meson_cipher_exit,
+ },
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
+ .setkey = meson_aes_setkey,
+ .encrypt = meson_skencrypt,
+ .decrypt = meson_skdecrypt,
+ }
+},
+{
+ .type = CRYPTO_ALG_TYPE_SKCIPHER,
+ .blockmode = MESON_OPMODE_ECB,
+ .alg.skcipher = {
+ .base = {
+ .cra_name = "ecb(aes)",
+ .cra_driver_name = "ecb-aes-gxl",
+ .cra_priority = 400,
+ .cra_blocksize = AES_BLOCK_SIZE,
+ .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
+ CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY |
+ CRYPTO_ALG_NEED_FALLBACK,
+ .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx),
+ .cra_module = THIS_MODULE,
+ .cra_alignmask = 0xf,
+ .cra_init = meson_cipher_init,
+ .cra_exit = meson_cipher_exit,
+ },
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .setkey = meson_aes_setkey,
+ .encrypt = meson_skencrypt,
+ .decrypt = meson_skdecrypt,
+ }
+},
+};
+
+int meson_cipher_register(struct meson_dev *mc)
+{
+ return meson_register_algs(mc, algs, ARRAY_SIZE(algs));
+}
+
+void meson_cipher_unregister(struct meson_dev *mc)
+{
+ meson_unregister_algs(mc, algs, ARRAY_SIZE(algs));
+}
+
+#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
+void meson_cipher_debugfs_show(struct seq_file *seq, void *v)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(algs); i++) {
+ seq_printf(seq, "%s %s %lu %lu\n",
+ algs[i].alg.skcipher.base.cra_driver_name,
+ algs[i].alg.skcipher.base.cra_name,
+ algs[i].stat_req, algs[i].stat_fb);
+ }
+}
+#endif
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index ae50ea51c8a0..5948c6e90c8e 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -62,60 +62,6 @@ static irqreturn_t meson_irq_handler(int irq, void *data)
return IRQ_HANDLED;
}
-static struct meson_alg_template mc_algs[] = {
-{
- .type = CRYPTO_ALG_TYPE_SKCIPHER,
- .blockmode = MESON_OPMODE_CBC,
- .alg.skcipher = {
- .base = {
- .cra_name = "cbc(aes)",
- .cra_driver_name = "cbc-aes-gxl",
- .cra_priority = 400,
- .cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
- CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY |
- CRYPTO_ALG_NEED_FALLBACK,
- .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx),
- .cra_module = THIS_MODULE,
- .cra_alignmask = 0xf,
- .cra_init = meson_cipher_init,
- .cra_exit = meson_cipher_exit,
- },
- .min_keysize = AES_MIN_KEY_SIZE,
- .max_keysize = AES_MAX_KEY_SIZE,
- .ivsize = AES_BLOCK_SIZE,
- .setkey = meson_aes_setkey,
- .encrypt = meson_skencrypt,
- .decrypt = meson_skdecrypt,
- }
-},
-{
- .type = CRYPTO_ALG_TYPE_SKCIPHER,
- .blockmode = MESON_OPMODE_ECB,
- .alg.skcipher = {
- .base = {
- .cra_name = "ecb(aes)",
- .cra_driver_name = "ecb-aes-gxl",
- .cra_priority = 400,
- .cra_blocksize = AES_BLOCK_SIZE,
- .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
- CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY |
- CRYPTO_ALG_NEED_FALLBACK,
- .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx),
- .cra_module = THIS_MODULE,
- .cra_alignmask = 0xf,
- .cra_init = meson_cipher_init,
- .cra_exit = meson_cipher_exit,
- },
- .min_keysize = AES_MIN_KEY_SIZE,
- .max_keysize = AES_MAX_KEY_SIZE,
- .setkey = meson_aes_setkey,
- .encrypt = meson_skencrypt,
- .decrypt = meson_skdecrypt,
- }
-},
-};
-
#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
static int meson_debugfs_show(struct seq_file *seq, void *v)
{
@@ -125,16 +71,8 @@ static int meson_debugfs_show(struct seq_file *seq, void *v)
for (i = 0; i < mc->flow_cnt; i++)
seq_printf(seq, "Channel %d: nreq %lu\n", i, mc->chanlist[i].stat_req);
- for (i = 0; i < ARRAY_SIZE(mc_algs); i++) {
- switch (mc_algs[i].type) {
- case CRYPTO_ALG_TYPE_SKCIPHER:
- seq_printf(seq, "%s %s %lu %lu\n",
- mc_algs[i].alg.skcipher.base.cra_driver_name,
- mc_algs[i].alg.skcipher.base.cra_name,
- mc_algs[i].stat_req, mc_algs[i].stat_fb);
- break;
- }
- }
+ meson_cipher_debugfs_show(seq, v);
+
return 0;
}
DEFINE_SHOW_ATTRIBUTE(meson_debugfs);
@@ -212,38 +150,40 @@ static int meson_allocate_chanlist(struct meson_dev *mc)
return err;
}
-static int meson_register_algs(struct meson_dev *mc)
+int meson_register_algs(struct meson_dev *mc, struct meson_alg_template *algs,
+ unsigned int count)
{
int err, i;
- for (i = 0; i < ARRAY_SIZE(mc_algs); i++) {
- mc_algs[i].mc = mc;
- switch (mc_algs[i].type) {
+ for (i = 0; i < count; i++) {
+ switch (algs[i].type) {
case CRYPTO_ALG_TYPE_SKCIPHER:
- err = crypto_register_skcipher(&mc_algs[i].alg.skcipher);
+ err = crypto_register_skcipher(&algs[i].alg.skcipher);
if (err) {
dev_err(mc->dev, "Fail to register %s\n",
- mc_algs[i].alg.skcipher.base.cra_name);
- mc_algs[i].mc = NULL;
+ algs[i].alg.skcipher.base.cra_name);
+ meson_unregister_algs(mc, algs, count);
return err;
}
break;
}
+ algs[i].mc = mc;
}
return 0;
}
-static void meson_unregister_algs(struct meson_dev *mc)
+void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs,
+ unsigned int count)
{
int i;
- for (i = 0; i < ARRAY_SIZE(mc_algs); i++) {
- if (!mc_algs[i].mc)
+ for (i = 0; i < count; i++) {
+ if (!algs[i].mc)
continue;
- switch (mc_algs[i].type) {
+ switch (algs[i].type) {
case CRYPTO_ALG_TYPE_SKCIPHER:
- crypto_unregister_skcipher(&mc_algs[i].alg.skcipher);
+ crypto_unregister_skcipher(&algs[i].alg.skcipher);
break;
}
}
@@ -297,9 +237,9 @@ static int meson_crypto_probe(struct platform_device *pdev)
if (err)
goto error_flow;
- err = meson_register_algs(mc);
+ err = meson_cipher_register(mc);
if (err)
- goto error_alg;
+ goto error_flow;
#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
mc->dbgfs_dir = debugfs_create_dir("gxl-crypto", NULL);
@@ -307,8 +247,6 @@ static int meson_crypto_probe(struct platform_device *pdev)
#endif
return 0;
-error_alg:
- meson_unregister_algs(mc);
error_flow:
meson_free_chanlist(mc, mc->flow_cnt - 1);
return err;
@@ -322,7 +260,7 @@ static int meson_crypto_remove(struct platform_device *pdev)
debugfs_remove_recursive(mc->dbgfs_dir);
#endif
- meson_unregister_algs(mc);
+ meson_cipher_unregister(mc);
meson_free_chanlist(mc, mc->flow_cnt - 1);
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 80ce6cb9baef..1e6ec5790750 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -167,9 +167,11 @@ void meson_dma_start(struct meson_dev *mc, int flow);
int meson_enqueue(struct crypto_async_request *areq, u32 type);
-int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
- unsigned int keylen);
-int meson_cipher_init(struct crypto_tfm *tfm);
-void meson_cipher_exit(struct crypto_tfm *tfm);
-int meson_skdecrypt(struct skcipher_request *areq);
-int meson_skencrypt(struct skcipher_request *areq);
+int meson_register_algs(struct meson_dev *mc, struct meson_alg_template *algs,
+ unsigned int count);
+void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs,
+ unsigned int count);
+
+int meson_cipher_register(struct meson_dev *mc);
+void meson_cipher_unregister(struct meson_dev *mc);
+void meson_cipher_debugfs_show(struct seq_file *seq, void *v);
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 08/24] drivers: crypto: meson: cleanup defines
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (6 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 07/24] drivers: crypto: meson: move algs definition and cipher API to cipher.c Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 09/24] drivers: crypto: meson: process more than MAXDESCS descriptors Alexey Romanov
` (17 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
It is bad to use hardcoded values directly in the code.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
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 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 == 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;
@@ -353,14 +353,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);
@@ -378,7 +378,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 = {
.cra_name = "cbc(aes)",
@@ -404,7 +404,7 @@ static struct meson_alg_template algs[] = {
},
{
.type = CRYPTO_ALG_TYPE_SKCIPHER,
- .blockmode = MESON_OPMODE_ECB,
+ .blockmode = DESC_OPMODE_ECB,
.alg.skcipher = {
.base = {
.cra_name = "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 <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 ((1 << 17) - 1)
+
#define DESC_LAST BIT(18)
#define DESC_ENCRYPTION BIT(28)
#define DESC_OWN BIT(31)
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 09/24] drivers: crypto: meson: process more than MAXDESCS descriptors
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (7 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 08/24] drivers: crypto: meson: cleanup defines Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 10/24] drivers: crypto: meson: avoid kzalloc in engine thread Alexey Romanov
` (16 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
1. The old alhorithm was not designed to process a large
amount of memory, and therefore gave incorrect results.
2. Not all Amlogic SoC's use 3 KEY/IV descriptors.
Add keyiv descriptors count parameter to platform data.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 443 ++++++++++++--------
drivers/crypto/amlogic/amlogic-gxl-core.c | 1 +
drivers/crypto/amlogic/amlogic-gxl.h | 2 +
3 files changed, 281 insertions(+), 165 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index 389f6aea7c25..59b1c754d326 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -17,35 +17,41 @@
#include <crypto/internal/skcipher.h>
#include "amlogic-gxl.h"
-static bool meson_cipher_need_fallback(struct skcipher_request *areq)
+static bool meson_cipher_need_fallback_sg(struct skcipher_request *areq,
+ struct scatterlist *sg)
{
- struct scatterlist *src_sg = areq->src;
- struct scatterlist *dst_sg = areq->dst;
+ struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
+ unsigned int blocksize = crypto_skcipher_blocksize(tfm);
+ unsigned int cryptlen = areq->cryptlen;
+
+ while (cryptlen) {
+ unsigned int len = min(cryptlen, sg->length);
+
+ if (!IS_ALIGNED(sg->offset, sizeof(u32)))
+ return true;
+ if (len % blocksize != 0)
+ return true;
+
+ cryptlen -= len;
+ sg = sg_next(sg);
+ }
+
+ return false;
+}
+static bool meson_cipher_need_fallback(struct skcipher_request *areq)
+{
if (areq->cryptlen == 0)
return true;
- if (sg_nents(src_sg) != sg_nents(dst_sg))
+ if (meson_cipher_need_fallback_sg(areq, areq->src))
return true;
- /* KEY/IV descriptors use 3 desc */
- if (sg_nents(src_sg) > MAXDESC - 3 || sg_nents(dst_sg) > MAXDESC - 3)
- return true;
+ if (areq->dst == areq->src)
+ return false;
- while (src_sg && dst_sg) {
- if ((src_sg->length % 16) != 0)
- return true;
- if ((dst_sg->length % 16) != 0)
- return true;
- if (src_sg->length != dst_sg->length)
- return true;
- if (!IS_ALIGNED(src_sg->offset, sizeof(u32)))
- return true;
- if (!IS_ALIGNED(dst_sg->offset, sizeof(u32)))
- return true;
- src_sg = sg_next(src_sg);
- dst_sg = sg_next(dst_sg);
- }
+ if (meson_cipher_need_fallback_sg(areq, areq->dst))
+ return true;
return false;
}
@@ -76,6 +82,211 @@ static int meson_cipher_do_fallback(struct skcipher_request *areq)
return err;
}
+struct cipher_ctx {
+ struct {
+ dma_addr_t addr;
+ unsigned int len;
+ } keyiv;
+
+ struct skcipher_request *areq;
+ struct scatterlist *src_sg;
+ struct scatterlist *dst_sg;
+
+ unsigned int src_offset;
+ unsigned int dst_offset;
+ unsigned int cryptlen;
+ unsigned int tloffset;
+};
+
+static int meson_map_scatterlist(struct skcipher_request *areq, struct meson_dev *mc)
+{
+ int nr_sgs, nr_sgd;
+
+ if (areq->src == areq->dst) {
+ nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src),
+ DMA_BIDIRECTIONAL);
+ if (!nr_sgs) {
+ dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs);
+ return -EINVAL;
+ }
+ } else {
+ nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src),
+ DMA_TO_DEVICE);
+ if (!nr_sgs) {
+ dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs);
+ return -EINVAL;
+ }
+
+ nr_sgd = dma_map_sg(mc->dev, areq->dst, sg_nents(areq->dst),
+ DMA_FROM_DEVICE);
+ if (!nr_sgd) {
+ dev_err(mc->dev, "Invalid SG count %d\n", nr_sgd);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
+static void meson_unmap_scatterlist(struct skcipher_request *areq, struct meson_dev *mc)
+{
+ if (areq->src == areq->dst) {
+ dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_BIDIRECTIONAL);
+ } else {
+ dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE);
+ dma_unmap_sg(mc->dev, areq->dst, sg_nents(areq->dst), DMA_FROM_DEVICE);
+ }
+}
+
+static void meson_setup_keyiv_descs(struct cipher_ctx *ctx)
+{
+ struct meson_cipher_req_ctx *rctx = skcipher_request_ctx(ctx->areq);
+ struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(ctx->areq);
+ struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
+ struct meson_alg_template *algt = container_of(alg,
+ struct meson_alg_template, alg.skcipher);
+ struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
+ struct meson_dev *mc = op->mc;
+ unsigned int ivsize = crypto_skcipher_ivsize(tfm);
+ unsigned int blockmode = algt->blockmode;
+ int i;
+
+ if (ctx->tloffset)
+ return;
+
+ if (blockmode == DESC_OPMODE_CBC) {
+ memcpy(op->key + AES_MAX_KEY_SIZE, ctx->areq->iv, ivsize);
+ ctx->keyiv.len = AES_MAX_KEY_SIZE + ivsize;
+ dma_sync_single_for_device(mc->dev, ctx->keyiv.addr,
+ ctx->keyiv.len, DMA_TO_DEVICE);
+ }
+
+ for (i = 0; i < mc->pdata->setup_desc_cnt; i++) {
+ struct meson_desc *desc =
+ &mc->chanlist[rctx->flow].tl[ctx->tloffset];
+ int offset = i * 16;
+
+ desc->t_src = cpu_to_le32(ctx->keyiv.addr + offset);
+ desc->t_dst = cpu_to_le32(offset);
+ desc->t_status = cpu_to_le32(DESC_OWN | DESC_MODE_KEY | ctx->keyiv.len);
+
+ ctx->tloffset++;
+ }
+}
+
+static bool meson_setup_data_descs(struct cipher_ctx *ctx)
+{
+ struct meson_cipher_req_ctx *rctx = skcipher_request_ctx(ctx->areq);
+ struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(ctx->areq);
+ struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
+ struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
+ struct meson_alg_template *algt = container_of(alg,
+ struct meson_alg_template,
+ alg.skcipher);
+ struct meson_dev *mc = op->mc;
+ struct meson_desc *desc = &mc->chanlist[rctx->flow].tl[ctx->tloffset];
+ unsigned int blocksize = crypto_skcipher_blocksize(tfm);
+ unsigned int blockmode = algt->blockmode;
+ unsigned int maxlen = rounddown(DESC_MAXLEN, blocksize);
+ unsigned int todo;
+ u32 v;
+
+ ctx->tloffset++;
+
+ todo = min(ctx->cryptlen, maxlen);
+ todo = min(todo, ctx->cryptlen);
+ todo = min(todo, sg_dma_len(ctx->src_sg) - ctx->src_offset);
+ todo = min(todo, sg_dma_len(ctx->dst_sg) - ctx->dst_offset);
+
+ desc->t_src = cpu_to_le32(sg_dma_address(ctx->src_sg) + ctx->src_offset);
+ desc->t_dst = cpu_to_le32(sg_dma_address(ctx->dst_sg) + ctx->dst_offset);
+
+ ctx->cryptlen -= todo;
+ ctx->src_offset += todo;
+ ctx->dst_offset += todo;
+
+ v = DESC_OWN | blockmode | op->keymode | todo;
+ if (rctx->op_dir == MESON_ENCRYPT)
+ v |= DESC_ENCRYPTION;
+
+ if (!ctx->cryptlen || ctx->tloffset == MAXDESC)
+ v |= DESC_LAST;
+
+ desc->t_status = cpu_to_le32(v);
+
+ return v & DESC_LAST;
+}
+
+static int meson_kick_hardware(struct cipher_ctx *ctx)
+{
+ struct meson_cipher_req_ctx *rctx = skcipher_request_ctx(ctx->areq);
+ struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(ctx->areq);
+ struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
+ struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
+ struct meson_alg_template *algt = container_of(alg,
+ struct meson_alg_template,
+ alg.skcipher);
+ struct meson_dev *mc = op->mc;
+ unsigned int ivsize = crypto_skcipher_ivsize(tfm);
+ unsigned int blockmode = algt->blockmode;
+ enum dma_data_direction new_iv_dir;
+ dma_addr_t new_iv_phys;
+ void *new_iv;
+ int err;
+
+ if (blockmode == DESC_OPMODE_CBC) {
+ struct scatterlist *sg;
+ unsigned int offset;
+
+ if (rctx->op_dir == MESON_ENCRYPT) {
+ sg = ctx->dst_sg;
+ offset = ctx->dst_offset;
+ new_iv_dir = DMA_FROM_DEVICE;
+ } else {
+ sg = ctx->src_sg;
+ offset = ctx->src_offset;
+ new_iv_dir = DMA_TO_DEVICE;
+ }
+
+ if (ctx->areq->src == ctx->areq->dst)
+ new_iv_dir = DMA_BIDIRECTIONAL;
+
+ offset -= ivsize;
+ new_iv = sg_virt(sg) + offset;
+ new_iv_phys = sg_dma_address(sg) + offset;
+ }
+
+ if (blockmode == DESC_OPMODE_CBC &&
+ rctx->op_dir == MESON_DECRYPT) {
+ dma_sync_single_for_cpu(mc->dev, new_iv_phys,
+ ivsize, new_iv_dir);
+ memcpy(ctx->areq->iv, new_iv, ivsize);
+ }
+
+ reinit_completion(&mc->chanlist[rctx->flow].complete);
+ meson_dma_start(mc, rctx->flow);
+ err = wait_for_completion_interruptible_timeout(
+ &mc->chanlist[rctx->flow].complete, msecs_to_jiffies(500));
+ if (err == 0) {
+ dev_err(mc->dev, "DMA timeout for flow %d\n", rctx->flow);
+ return -EINVAL;
+ } else if (err < 0) {
+ dev_err(mc->dev, "Waiting for DMA completion is failed (%d)\n", err);
+ return err;
+ }
+
+ if (blockmode == DESC_OPMODE_CBC &&
+ rctx->op_dir == MESON_ENCRYPT) {
+ dma_sync_single_for_cpu(mc->dev, new_iv_phys,
+ ivsize, new_iv_dir);
+ memcpy(ctx->areq->iv, new_iv, ivsize);
+ }
+
+ ctx->tloffset = 0;
+
+ return 0;
+}
+
static int meson_cipher(struct skcipher_request *areq)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
@@ -84,176 +295,78 @@ static int meson_cipher(struct skcipher_request *areq)
struct meson_dev *mc = op->mc;
struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
struct meson_alg_template *algt;
- int flow = rctx->flow;
- unsigned int todo, eat, len;
- struct scatterlist *src_sg = areq->src;
- struct scatterlist *dst_sg = areq->dst;
- struct meson_desc *desc;
- int nr_sgs, nr_sgd;
- int i, err = 0;
- unsigned int keyivlen, ivsize, offset, tloffset;
- dma_addr_t phykeyiv;
- void *backup_iv = NULL, *bkeyiv;
- u32 v;
-
- algt = container_of(alg, struct meson_alg_template, alg.skcipher);
+ struct cipher_ctx ctx = {
+ .areq = areq,
+ .src_offset = 0,
+ .dst_offset = 0,
+ .src_sg = areq->src,
+ .dst_sg = areq->dst,
+ .cryptlen = areq->cryptlen,
+ };
+ unsigned int ivsize = crypto_skcipher_ivsize(tfm);
+ int err;
- dev_dbg(mc->dev, "%s %s %u %x IV(%u) key=%u flow=%d\n", __func__,
+ dev_dbg(mc->dev, "%s %s %u %x IV(%u) key=%u ctx.flow=%d\n", __func__,
crypto_tfm_alg_name(areq->base.tfm),
areq->cryptlen,
rctx->op_dir, crypto_skcipher_ivsize(tfm),
- op->keylen, flow);
+ op->keylen, rctx->flow);
+
+ algt = container_of(alg, struct meson_alg_template, alg.skcipher);
#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
algt->stat_req++;
- mc->chanlist[flow].stat_req++;
+ mc->chanlist[rctx->flow].stat_req++;
#endif
- /*
- * The hardware expect a list of meson_desc structures.
- * The 2 first structures store key
- * The third stores IV
- */
- bkeyiv = kzalloc(48, GFP_KERNEL | GFP_DMA);
- if (!bkeyiv)
+ op->key = kzalloc(48, GFP_KERNEL | GFP_DMA);
+ if (!op.key)
return -ENOMEM;
- memcpy(bkeyiv, op->key, op->keylen);
- keyivlen = op->keylen;
+ memcpy(op->key, op->key, op->keylen);
+ ctx.keyiv.len = op->keylen;
+ if (ctx.keyiv.len == AES_KEYSIZE_192)
+ ctx.keyiv.len = AES_MAX_KEY_SIZE;
- ivsize = crypto_skcipher_ivsize(tfm);
- if (areq->iv && ivsize > 0) {
- if (ivsize > areq->cryptlen) {
- dev_err(mc->dev, "invalid ivsize=%d vs len=%d\n", ivsize, areq->cryptlen);
- err = -EINVAL;
- goto theend;
- }
- memcpy(bkeyiv + 32, areq->iv, ivsize);
- keyivlen = 48;
- if (rctx->op_dir == MESON_DECRYPT) {
- backup_iv = kzalloc(ivsize, GFP_KERNEL);
- if (!backup_iv) {
- err = -ENOMEM;
- goto theend;
- }
- offset = areq->cryptlen - ivsize;
- scatterwalk_map_and_copy(backup_iv, areq->src, offset,
- ivsize, 0);
- }
- }
- if (keyivlen == AES_KEYSIZE_192)
- keyivlen = AES_MAX_KEY_SIZE;
-
- phykeyiv = dma_map_single(mc->dev, bkeyiv, keyivlen,
+ ctx.keyiv.addr = dma_map_single(mc->dev, op->key, ctx.keyiv.len,
DMA_TO_DEVICE);
- err = dma_mapping_error(mc->dev, phykeyiv);
+ err = dma_mapping_error(mc->dev, ctx.keyiv.addr);
if (err) {
dev_err(mc->dev, "Cannot DMA MAP KEY IV\n");
goto theend;
}
- tloffset = 0;
- eat = 0;
- i = 0;
- while (keyivlen > eat) {
- desc = &mc->chanlist[flow].tl[tloffset];
- memset(desc, 0, sizeof(struct meson_desc));
- todo = min(keyivlen - eat, 16u);
- desc->t_src = cpu_to_le32(phykeyiv + i * 16);
- desc->t_dst = cpu_to_le32(i * 16);
- v = DESC_MODE_KEY | DESC_OWN | 16;
- desc->t_status = cpu_to_le32(v);
-
- eat += todo;
- i++;
- tloffset++;
- }
-
- if (areq->src == areq->dst) {
- nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src),
- DMA_BIDIRECTIONAL);
- if (!nr_sgs) {
- dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs);
- err = -EINVAL;
- goto theend;
- }
- nr_sgd = nr_sgs;
- } else {
- nr_sgs = dma_map_sg(mc->dev, areq->src, sg_nents(areq->src),
- DMA_TO_DEVICE);
- if (!nr_sgs || nr_sgs > MAXDESC - 3) {
- dev_err(mc->dev, "Invalid SG count %d\n", nr_sgs);
- err = -EINVAL;
- goto theend;
- }
- nr_sgd = dma_map_sg(mc->dev, areq->dst, sg_nents(areq->dst),
- DMA_FROM_DEVICE);
- if (!nr_sgd || nr_sgd > MAXDESC - 3) {
- dev_err(mc->dev, "Invalid SG count %d\n", nr_sgd);
- err = -EINVAL;
- goto theend;
- }
- }
-
- src_sg = areq->src;
- dst_sg = areq->dst;
- len = areq->cryptlen;
- while (src_sg) {
- desc = &mc->chanlist[flow].tl[tloffset];
- memset(desc, 0, sizeof(struct meson_desc));
-
- 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 | DESC_OWN | todo | algt->blockmode;
- if (rctx->op_dir)
- v |= DESC_ENCRYPTION;
- len -= todo;
-
- if (!sg_next(src_sg))
- v |= DESC_LAST;
- desc->t_status = cpu_to_le32(v);
- tloffset++;
- src_sg = sg_next(src_sg);
- dst_sg = sg_next(dst_sg);
- }
+ err = meson_map_scatterlist(areq, mc);
+ if (err)
+ goto theend;
- reinit_completion(&mc->chanlist[flow].complete);
- meson_dma_start(mc, flow);
+ ctx.tloffset = 0;
- err = wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete,
- msecs_to_jiffies(500));
- if (err == 0) {
- dev_err(mc->dev, "DMA timeout for flow %d\n", flow);
- err = -EINVAL;
- } else if (err < 0) {
- dev_err(mc->dev, "Waiting for DMA completion is failed (%d)\n", err);
- } else {
- /* No error */
- err = 0;
- }
+ while (ctx.cryptlen) {
+ meson_setup_keyiv_descs(&ctx);
- dma_unmap_single(mc->dev, phykeyiv, keyivlen, DMA_TO_DEVICE);
+ if (meson_setup_data_descs(&ctx)) {
+ err = meson_kick_hardware(&ctx);
+ if (err)
+ break;
+ }
- if (areq->src == areq->dst) {
- dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_BIDIRECTIONAL);
- } else {
- dma_unmap_sg(mc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE);
- dma_unmap_sg(mc->dev, areq->dst, sg_nents(areq->dst), DMA_FROM_DEVICE);
- }
+ if (ctx.src_offset == sg_dma_len(ctx.src_sg)) {
+ ctx.src_offset = 0;
+ ctx.src_sg = sg_next(ctx.src_sg);
+ }
- if (areq->iv && ivsize > 0) {
- if (rctx->op_dir == MESON_DECRYPT) {
- memcpy(areq->iv, backup_iv, ivsize);
- } else {
- scatterwalk_map_and_copy(areq->iv, areq->dst,
- areq->cryptlen - ivsize,
- ivsize, 0);
+ if (ctx.dst_offset == sg_dma_len(ctx.dst_sg)) {
+ ctx.dst_offset = 0;
+ ctx.dst_sg = sg_next(ctx.dst_sg);
}
}
+
+ dma_unmap_single(mc->dev, ctx.keyiv.addr, ctx.keyiv.len, DMA_TO_DEVICE);
+ meson_unmap_scatterlist(areq, mc);
+
theend:
- kfree_sensitive(bkeyiv);
- kfree_sensitive(backup_iv);
+ kfree_sensitive(op->key);
return err;
}
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index 5948c6e90c8e..fe10292b3111 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -192,6 +192,7 @@ void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs
static const struct meson_pdata meson_gxl_pdata = {
.descs_reg = 0x0,
.status_reg = 0x4,
+ .setup_desc_cnt = 3,
};
static const struct of_device_id meson_crypto_of_match_table[] = {
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 8e28adc57d39..36628a7a4cf3 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -82,10 +82,12 @@ struct meson_flow {
* struct meson_pdata - SoC series dependent data.
* @reg_descs: offset to descriptors register
* @reg_status: offset to status register
+ * @setup_desc_cnt: number of setup descriptor to configure.
*/
struct meson_pdata {
u32 descs_reg;
u32 status_reg;
+ u32 setup_desc_cnt;
};
/*
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 10/24] drivers: crypto: meson: avoid kzalloc in engine thread
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (8 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 09/24] drivers: crypto: meson: process more than MAXDESCS descriptors Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 11/24] drivers: crypto: meson: introduce hasher Alexey Romanov
` (15 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
It makes no sense to allocate memory via kzalloc, we
can use static buffer, speedup data processing and
don't think about kfree() calls.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 24 ++++++++-------------
drivers/crypto/amlogic/amlogic-gxl.h | 6 +++---
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index 59b1c754d326..6ff0e088939f 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -155,8 +155,7 @@ static void meson_setup_keyiv_descs(struct cipher_ctx *ctx)
return;
if (blockmode == DESC_OPMODE_CBC) {
- memcpy(op->key + AES_MAX_KEY_SIZE, ctx->areq->iv, ivsize);
- ctx->keyiv.len = AES_MAX_KEY_SIZE + ivsize;
+ memcpy(op->keyiv + AES_MAX_KEY_SIZE, ctx->areq->iv, ivsize);
dma_sync_single_for_device(mc->dev, ctx->keyiv.addr,
ctx->keyiv.len, DMA_TO_DEVICE);
}
@@ -319,16 +318,16 @@ static int meson_cipher(struct skcipher_request *areq)
mc->chanlist[rctx->flow].stat_req++;
#endif
- op->key = kzalloc(48, GFP_KERNEL | GFP_DMA);
- if (!op.key)
- return -ENOMEM;
-
- memcpy(op->key, op->key, op->keylen);
ctx.keyiv.len = op->keylen;
if (ctx.keyiv.len == AES_KEYSIZE_192)
ctx.keyiv.len = AES_MAX_KEY_SIZE;
- ctx.keyiv.addr = dma_map_single(mc->dev, op->key, ctx.keyiv.len,
+ if (algt->blockmode == DESC_OPMODE_CBC) {
+ memcpy(op->keyiv + AES_MAX_KEY_SIZE, areq->iv, ivsize);
+ ctx.keyiv.len = AES_MAX_KEY_SIZE + ivsize;
+ }
+
+ ctx.keyiv.addr = dma_map_single(mc->dev, op->keyiv, ctx.keyiv.len,
DMA_TO_DEVICE);
err = dma_mapping_error(mc->dev, ctx.keyiv.addr);
if (err) {
@@ -366,8 +365,6 @@ static int meson_cipher(struct skcipher_request *areq)
meson_unmap_scatterlist(areq, mc);
theend:
- kfree_sensitive(op->key);
-
return err;
}
@@ -455,7 +452,6 @@ static void meson_cipher_exit(struct crypto_tfm *tfm)
{
struct meson_cipher_tfm_ctx *op = crypto_tfm_ctx(tfm);
- kfree_sensitive(op->key);
crypto_free_skcipher(op->fallback_tfm);
}
@@ -479,11 +475,9 @@ static int meson_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
dev_dbg(mc->dev, "ERROR: Invalid keylen %u\n", keylen);
return -EINVAL;
}
- kfree_sensitive(op->key);
+
+ memcpy(op->keyiv, key, keylen);
op->keylen = keylen;
- op->key = kmemdup(key, keylen, GFP_KERNEL | GFP_DMA);
- if (!op->key)
- return -ENOMEM;
return crypto_skcipher_setkey(op->fallback_tfm, key, keylen);
}
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 36628a7a4cf3..2eeafdca1669 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -128,7 +128,7 @@ struct meson_cipher_req_ctx {
/*
* struct meson_cipher_tfm_ctx - context for a skcipher TFM
* @enginectx: crypto_engine used by this TFM
- * @key: pointer to key data
+ * @keyiv: key data
* @keylen: len of the key
* @keymode: The keymode(type and size of key) associated with this TFM
* @mc: pointer to the private data of driver handling this TFM
@@ -136,8 +136,8 @@ struct meson_cipher_req_ctx {
*/
struct meson_cipher_tfm_ctx {
struct crypto_engine_ctx enginectx;
- u32 *key;
- u32 keylen;
+ u8 keyiv[AES_MAX_KEY_SIZE + AES_BLOCK_SIZE] ____cacheline_aligned;
+ u32 keylen ____cacheline_aligned;
u32 keymode;
struct meson_dev *mc;
struct crypto_skcipher *fallback_tfm;
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 11/24] drivers: crypto: meson: introduce hasher
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (9 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 10/24] drivers: crypto: meson: avoid kzalloc in engine thread Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 12/24] drivers: crypto: meson: add support for AES-CTR Alexey Romanov
` (14 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
Introduce support for SHA1/SHA224/SHA256 hash algos.
Tested via tcrypt and custom tests.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/Makefile | 2 +-
drivers/crypto/amlogic/amlogic-gxl-core.c | 21 +
drivers/crypto/amlogic/amlogic-gxl-hasher.c | 448 ++++++++++++++++++++
drivers/crypto/amlogic/amlogic-gxl.h | 50 +++
4 files changed, 520 insertions(+), 1 deletion(-)
create mode 100644 drivers/crypto/amlogic/amlogic-gxl-hasher.c
diff --git a/drivers/crypto/amlogic/Makefile b/drivers/crypto/amlogic/Makefile
index 39057e62c13e..4b6b388b7880 100644
--- a/drivers/crypto/amlogic/Makefile
+++ b/drivers/crypto/amlogic/Makefile
@@ -1,2 +1,2 @@
obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic-gxl-crypto.o
-amlogic-gxl-crypto-y := amlogic-gxl-core.o amlogic-gxl-cipher.o
+amlogic-gxl-crypto-y := amlogic-gxl-core.o amlogic-gxl-cipher.o amlogic-gxl-hasher.o
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index fe10292b3111..a2bc9299214a 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -16,6 +16,7 @@
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <crypto/internal/skcipher.h>
+#include <crypto/internal/hash.h>
#include <linux/dma-mapping.h>
#include "amlogic-gxl.h"
@@ -166,6 +167,15 @@ int meson_register_algs(struct meson_dev *mc, struct meson_alg_template *algs,
return err;
}
break;
+ case CRYPTO_ALG_TYPE_AHASH:
+ err = crypto_register_ahash(&algs[i].alg.ahash);
+ if (err) {
+ dev_err(mc->dev, "Fail to register %s\n",
+ algs[i].alg.ahash.halg.base.cra_name);
+ meson_unregister_algs(mc, algs, count);
+ return err;
+ }
+ break;
}
algs[i].mc = mc;
}
@@ -185,6 +195,9 @@ void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs
case CRYPTO_ALG_TYPE_SKCIPHER:
crypto_unregister_skcipher(&algs[i].alg.skcipher);
break;
+ case CRYPTO_ALG_TYPE_AHASH:
+ crypto_unregister_ahash(&algs[i].alg.ahash);
+ break;
}
}
}
@@ -242,12 +255,20 @@ static int meson_crypto_probe(struct platform_device *pdev)
if (err)
goto error_flow;
+ err = meson_hasher_register(mc);
+ if (err)
+ goto error_hasher;
+
#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
mc->dbgfs_dir = debugfs_create_dir("gxl-crypto", NULL);
debugfs_create_file("stats", 0444, mc->dbgfs_dir, mc, &meson_debugfs_fops);
#endif
return 0;
+
+error_hasher:
+ meson_cipher_unregister(mc);
+
error_flow:
meson_free_chanlist(mc, mc->flow_cnt - 1);
return err;
diff --git a/drivers/crypto/amlogic/amlogic-gxl-hasher.c b/drivers/crypto/amlogic/amlogic-gxl-hasher.c
new file mode 100644
index 000000000000..2517fa97af89
--- /dev/null
+++ b/drivers/crypto/amlogic/amlogic-gxl-hasher.c
@@ -0,0 +1,448 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Hardware asynchronous hasher for Amlogic SoC's.
+ *
+ * Copyright (c) 2023, SaluteDevices. All Rights Reserved.
+ *
+ * Author: Jan Dakinevich <yvdakinevich@salutedevices.com>
+ * Author: Alexey Romanov <avromanov@salutedevices.com>
+ */
+
+#include <linux/crypto.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <crypto/internal/hash.h>
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
+
+#include "amlogic-gxl.h"
+
+static int meson_sha_init(struct ahash_request *req)
+{
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+
+ memset(rctx, 0, sizeof(struct meson_hasher_req_ctx));
+
+ rctx->flow = meson_get_engine_number(tctx->mc);
+ rctx->begin_req = true;
+
+ return 0;
+}
+
+static int meson_sha_update(struct ahash_request *req)
+{
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct crypto_engine *engine = tctx->mc->chanlist[rctx->flow].engine;
+
+ return crypto_transfer_hash_request_to_engine(engine, req);
+}
+
+static int meson_sha_final(struct ahash_request *req)
+{
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct crypto_engine *engine = tctx->mc->chanlist[rctx->flow].engine;
+
+ rctx->final_req = true;
+
+ return crypto_transfer_hash_request_to_engine(engine, req);
+}
+
+static int meson_hasher_req_map(struct ahash_request *req)
+{
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_dev *mc = tctx->mc;
+ int ret;
+
+ if (!req->nbytes)
+ return 0;
+
+ ret = dma_map_sg(mc->dev, req->src, sg_nents(req->src), DMA_TO_DEVICE);
+ if (!ret) {
+ dev_err(mc->dev, "Cannot DMA MAP request data\n");
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static void meson_hasher_req_unmap(struct ahash_request *req)
+{
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_dev *mc = tctx->mc;
+
+ if (!req->nbytes)
+ return;
+
+ dma_unmap_sg(mc->dev, req->src, sg_nents(req->src), DMA_TO_DEVICE);
+}
+
+struct hasher_ctx {
+ struct crypto_async_request *areq;
+
+ unsigned int tloffset;
+ unsigned int nbytes;
+ unsigned int todo;
+
+ dma_addr_t state_addr;
+ dma_addr_t src_addr;
+ unsigned int src_offset;
+ struct scatterlist *src_sg;
+};
+
+static bool meson_final(struct hasher_ctx *ctx)
+{
+ struct ahash_request *req = ahash_request_cast(ctx->areq);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+
+ return !ctx->nbytes && rctx->final_req;
+}
+
+static int meson_fill_partial_buffer(struct hasher_ctx *ctx, unsigned int len)
+{
+ struct ahash_request *req = ahash_request_cast(ctx->areq);
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct meson_dev *mc = tctx->mc;
+ unsigned int blocksize = crypto_ahash_blocksize(tfm);
+ unsigned int copy;
+
+ if (len) {
+ copy = min(blocksize - rctx->partial_size, len);
+ memcpy(rctx->partial + rctx->partial_size,
+ sg_virt(ctx->src_sg) + ctx->src_offset, copy);
+
+ rctx->partial_size += copy;
+ ctx->nbytes -= copy;
+ ctx->src_offset += copy;
+ }
+
+ if (rctx->partial_size == blocksize || meson_final(ctx)) {
+ rctx->partial_addr = dma_map_single(mc->dev,
+ rctx->partial,
+ rctx->partial_size,
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(mc->dev, rctx->partial_addr)) {
+ dev_err(mc->dev, "Cannot DMA MAP SHA partial buffer\n");
+ return -ENOMEM;
+ }
+
+ rctx->partial_mapped = true;
+ ctx->todo = rctx->partial_size;
+ ctx->src_addr = rctx->partial_addr;
+ }
+
+ return 0;
+}
+
+static unsigned int meson_setup_data_descs(struct hasher_ctx *ctx)
+{
+ struct ahash_request *req = ahash_request_cast(ctx->areq);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_dev *mc = tctx->mc;
+ struct meson_flow *flow = &mc->chanlist[rctx->flow];
+ struct hash_alg_common *alg = crypto_hash_alg_common(tfm);
+ struct meson_alg_template *algt = container_of(alg,
+ struct meson_alg_template, alg.ahash.halg);
+ struct meson_desc *desc = &flow->tl[ctx->tloffset];
+ u32 v;
+
+ ctx->tloffset++;
+
+ v = DESC_OWN | DESC_ENCRYPTION | DESC_OPMODE_SHA |
+ ctx->todo | algt->blockmode;
+ if (rctx->begin_req) {
+ rctx->begin_req = false;
+ v |= DESC_BEGIN;
+ }
+
+ if (!ctx->nbytes && rctx->final_req) {
+ rctx->final_req = false;
+ v |= DESC_END;
+ }
+
+ if (!ctx->nbytes || ctx->tloffset == MAXDESC || rctx->partial_mapped)
+ v |= DESC_LAST;
+
+ desc->t_src = cpu_to_le32(ctx->src_addr);
+ desc->t_dst = cpu_to_le32(ctx->state_addr);
+ desc->t_status = cpu_to_le32(v);
+
+ return v & DESC_LAST;
+}
+
+static int meson_kick_hardware(struct hasher_ctx *ctx)
+{
+ struct ahash_request *req = ahash_request_cast(ctx->areq);
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_dev *mc = tctx->mc;
+ struct meson_flow *flow = &mc->chanlist[rctx->flow];
+ int ret;
+
+ reinit_completion(&flow->complete);
+ meson_dma_start(mc, rctx->flow);
+
+ ret = wait_for_completion_timeout(&flow->complete,
+ msecs_to_jiffies(500));
+ if (ret == 0) {
+ dev_err(mc->dev, "DMA timeout for flow %d\n", rctx->flow);
+ return -EINVAL;
+ } else if (ret < 0) {
+ dev_err(mc->dev, "Waiting for DMA completion is failed (%d)\n", ret);
+ return ret;
+ }
+
+ if (rctx->partial_mapped) {
+ dma_unmap_single(mc->dev, rctx->partial_addr,
+ rctx->partial_size,
+ DMA_TO_DEVICE);
+ rctx->partial_size = 0;
+ rctx->partial_mapped = false;
+ }
+
+ ctx->tloffset = 0;
+
+ return 0;
+}
+
+static void meson_setup_state_descs(struct hasher_ctx *ctx)
+{
+ struct ahash_request *req = ahash_request_cast(ctx->areq);
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_dev *mc = tctx->mc;
+ struct meson_desc *desc;
+ int i;
+
+ if (ctx->tloffset || rctx->begin_req)
+ return;
+
+ for (i = 0; i < mc->pdata->setup_desc_cnt; i++) {
+ int offset = i * 16;
+
+ desc = &mc->chanlist[rctx->flow].tl[ctx->tloffset];
+ desc->t_src = cpu_to_le32(ctx->state_addr + offset);
+ desc->t_dst = cpu_to_le32(offset);
+ desc->t_status = cpu_to_le32(MESON_SHA_BUFFER_SIZE |
+ DESC_MODE_KEY | DESC_OWN);
+
+ ctx->tloffset++;
+ }
+}
+
+static int meson_hasher_do_one_request(struct crypto_engine *engine, void *areq)
+{
+ struct ahash_request *req = ahash_request_cast(areq);
+ struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
+ struct meson_hasher_tfm_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct meson_hasher_req_ctx *rctx = ahash_request_ctx(req);
+ struct meson_dev *mc = tctx->mc;
+ struct hasher_ctx ctx = {
+ .tloffset = 0,
+ .src_offset = 0,
+ .nbytes = req->nbytes,
+ .src_sg = req->src,
+ .areq = areq,
+ };
+ unsigned int blocksize = crypto_ahash_blocksize(tfm);
+ unsigned int digest_size = crypto_ahash_digestsize(tfm);
+ bool final_req = rctx->final_req;
+ int ret;
+
+ ctx.state_addr = dma_map_single(mc->dev, rctx->state,
+ sizeof(rctx->state), DMA_BIDIRECTIONAL);
+ ret = dma_mapping_error(mc->dev, ctx.state_addr);
+ if (ret) {
+ dev_err(mc->dev, "Cannot DMA MAP SHA state buffer");
+ goto fail_map_single;
+ }
+
+ ret = meson_hasher_req_map(req);
+ if (ret)
+ goto fail_map_req;
+
+ for (;;) {
+ unsigned int len = ctx.src_sg ?
+ min(sg_dma_len(ctx.src_sg) - ctx.src_offset, ctx.nbytes) : 0;
+
+ ctx.src_addr = 0;
+ ctx.todo = 0;
+
+ if (!rctx->final_req && !ctx.nbytes)
+ break;
+
+ meson_setup_state_descs(&ctx);
+
+ if (rctx->partial_size && rctx->partial_size < blocksize) {
+ ret = meson_fill_partial_buffer(&ctx, len);
+ if (ret)
+ goto fail;
+ } else if (len && len < blocksize) {
+ memcpy(rctx->partial, sg_virt(ctx.src_sg) + ctx.src_offset, len);
+
+ rctx->partial_size = len;
+ ctx.nbytes -= len;
+ ctx.src_offset += len;
+ } else if (len) {
+ ctx.src_addr = sg_dma_address(ctx.src_sg) + ctx.src_offset;
+ ctx.todo = min(rounddown(DESC_MAXLEN, blocksize),
+ rounddown(len, blocksize));
+ ctx.nbytes -= ctx.todo;
+ ctx.src_offset += ctx.todo;
+ }
+
+ if (ctx.src_sg && ctx.src_offset == sg_dma_len(ctx.src_sg)) {
+ ctx.src_offset = 0;
+ ctx.src_sg = sg_next(ctx.src_sg);
+ }
+
+ if (!ctx.todo && ctx.nbytes)
+ continue;
+
+ if (!ctx.todo && !rctx->final_req && !ctx.tloffset)
+ continue;
+
+ if (meson_setup_data_descs(&ctx)) {
+ ret = meson_kick_hardware(&ctx);
+ if (ret)
+ goto fail;
+ }
+ }
+
+fail:
+ meson_hasher_req_unmap(req);
+
+fail_map_req:
+ dma_unmap_single(mc->dev, ctx.state_addr, sizeof(rctx->state),
+ DMA_BIDIRECTIONAL);
+
+fail_map_single:
+ if (final_req && ret == 0)
+ memcpy(req->result, rctx->state, digest_size);
+
+ local_bh_disable();
+ crypto_finalize_hash_request(engine, req, ret);
+ local_bh_enable();
+
+ return ret;
+}
+
+static int meson_hasher_init(struct crypto_tfm *tfm)
+{
+ struct meson_hasher_tfm_ctx *tctx = crypto_tfm_ctx(tfm);
+ struct crypto_ahash *atfm = __crypto_ahash_cast(tfm);
+ struct hash_alg_common *alg = crypto_hash_alg_common(atfm);
+ struct meson_alg_template *algt = container_of(alg,
+ struct meson_alg_template, alg.ahash.halg);
+
+ crypto_ahash_set_reqsize(atfm, crypto_ahash_statesize(atfm));
+
+ memset(tctx, 0, sizeof(struct meson_hasher_tfm_ctx));
+
+ tctx->mc = algt->mc;
+
+ tctx->enginectx.op.do_one_request = meson_hasher_do_one_request;
+ tctx->enginectx.op.prepare_request = NULL;
+ tctx->enginectx.op.unprepare_request = NULL;
+
+ return 0;
+}
+
+static struct meson_alg_template mc_algs[] = {
+{
+ .type = CRYPTO_ALG_TYPE_AHASH,
+ .blockmode = DESC_MODE_SHA1,
+ .alg.ahash = {
+ .halg = {
+ .base = {
+ .cra_name = "sha1",
+ .cra_driver_name = "sha1-gxl",
+ .cra_priority = 400,
+ .cra_blocksize = SHA1_BLOCK_SIZE,
+ .cra_flags = CRYPTO_ALG_ASYNC,
+ .cra_ctxsize = sizeof(struct meson_hasher_tfm_ctx),
+ .cra_module = THIS_MODULE,
+ .cra_alignmask = 0,
+ .cra_init = meson_hasher_init,
+ },
+ .digestsize = SHA1_DIGEST_SIZE,
+ .statesize = sizeof(struct meson_hasher_req_ctx),
+ },
+ .init = meson_sha_init,
+ .update = meson_sha_update,
+ .final = meson_sha_final,
+ },
+},
+{
+ .type = CRYPTO_ALG_TYPE_AHASH,
+ .blockmode = DESC_MODE_SHA224,
+ .alg.ahash = {
+ .halg = {
+ .base = {
+ .cra_name = "sha224",
+ .cra_driver_name = "sha224-gxl",
+ .cra_priority = 400,
+ .cra_blocksize = SHA224_BLOCK_SIZE,
+ .cra_flags = CRYPTO_ALG_ASYNC,
+ .cra_ctxsize = sizeof(struct meson_hasher_tfm_ctx),
+ .cra_module = THIS_MODULE,
+ .cra_alignmask = 0,
+ .cra_init = meson_hasher_init,
+ },
+ .digestsize = SHA224_DIGEST_SIZE,
+ .statesize = sizeof(struct meson_hasher_req_ctx),
+ },
+ .init = meson_sha_init,
+ .update = meson_sha_update,
+ .final = meson_sha_final,
+ },
+},
+{
+ .type = CRYPTO_ALG_TYPE_AHASH,
+ .blockmode = DESC_MODE_SHA256,
+ .alg.ahash = {
+ .halg = {
+ .base = {
+ .cra_name = "sha256",
+ .cra_driver_name = "sha256-gxl",
+ .cra_priority = 400,
+ .cra_blocksize = SHA256_BLOCK_SIZE,
+ .cra_flags = CRYPTO_ALG_ASYNC,
+ .cra_ctxsize = sizeof(struct meson_hasher_tfm_ctx),
+ .cra_module = THIS_MODULE,
+ .cra_alignmask = 0,
+ .cra_init = meson_hasher_init,
+ },
+ .digestsize = SHA256_DIGEST_SIZE,
+ .statesize = sizeof(struct meson_hasher_req_ctx),
+ },
+ .init = meson_sha_init,
+ .update = meson_sha_update,
+ .final = meson_sha_final,
+ },
+},
+};
+
+int meson_hasher_register(struct meson_dev *mc)
+{
+ return meson_register_algs(mc, mc_algs, ARRAY_SIZE(mc_algs));
+}
+
+void meson_hasher_unregister(struct meson_dev *mc)
+{
+ meson_unregister_algs(mc, mc_algs, ARRAY_SIZE(mc_algs));
+}
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 2eeafdca1669..5d80471f6a6a 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -5,6 +5,7 @@
* Copyright (C) 2018-2019 Corentin LABBE <clabbe@baylibre.com>
*/
#include <crypto/aes.h>
+#include <crypto/sha2.h>
#include <crypto/engine.h>
#include <crypto/skcipher.h>
#include <linux/debugfs.h>
@@ -23,13 +24,25 @@
#define DESC_OPMODE_ECB (0 << 26)
#define DESC_OPMODE_CBC (1 << 26)
+#define DESC_OPMODE_SHA (0 << 26)
#define DESC_MAXLEN ((1 << 17) - 1)
+#define DESC_MODE_SHA1 (0x5 << 20)
+#define DESC_MODE_SHA224 (0x7 << 20)
+#define DESC_MODE_SHA256 (0x6 << 20)
+
#define DESC_LAST BIT(18)
+#define DESC_BEGIN BIT(24)
+#define DESC_END BIT(25)
#define DESC_ENCRYPTION BIT(28)
#define DESC_OWN BIT(31)
+#define MESON_SHA_BUFFER_SIZE (SHA256_DIGEST_SIZE + 16)
+
+#define MESON_SHA_BEGIN BIT(1)
+#define MESON_SHA_FINAL BIT(2)
+
/*
* struct meson_desc - Descriptor for DMA operations
* Note that without datasheet, some are unknown
@@ -143,6 +156,39 @@ struct meson_cipher_tfm_ctx {
struct crypto_skcipher *fallback_tfm;
};
+/*
+ * struct meson_hasher_req_ctx - context for a hasher request
+ * @state: state data
+ * @partial: partial buffer data. Contains sent data which
+ * size < blocksize
+ * @partial_size: size of the partial buffer
+ * @partial_addr: physical address of partial buffer
+ * @partial_mapped: indicates is partial buffer currently mapped or not
+ * @flags: request flags (for example, is this final req or not)
+ * @flow: the flow to use for this request
+ */
+struct meson_hasher_req_ctx {
+ u8 state[SHA256_DIGEST_SIZE + 16] ____cacheline_aligned;
+ u8 partial[SHA256_BLOCK_SIZE] ____cacheline_aligned;
+ unsigned int partial_size ____cacheline_aligned;
+ dma_addr_t partial_addr;
+ bool partial_mapped;
+
+ bool begin_req;
+ bool final_req;
+ int flow;
+};
+
+/*
+ * struct meson_hasher_tfm_ctx - context for a hasher TFM
+ * @enginectx: crypto_engine used by this TFM
+ * @mc: pointer to the private data of driver handling this TFM
+ */
+struct meson_hasher_tfm_ctx {
+ struct crypto_engine_ctx enginectx;
+ struct meson_dev *mc;
+};
+
/*
* struct meson_alg_template - crypto_alg template
* @type: the CRYPTO_ALG_TYPE for this template
@@ -157,6 +203,7 @@ struct meson_alg_template {
u32 blockmode;
union {
struct skcipher_alg skcipher;
+ struct ahash_alg ahash;
} alg;
struct meson_dev *mc;
#ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
@@ -179,3 +226,6 @@ void meson_unregister_algs(struct meson_dev *mc, struct meson_alg_template *algs
int meson_cipher_register(struct meson_dev *mc);
void meson_cipher_unregister(struct meson_dev *mc);
void meson_cipher_debugfs_show(struct seq_file *seq, void *v);
+
+int meson_hasher_register(struct meson_dev *mc);
+void meson_hasher_unregister(struct meson_dev *mc);
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 12/24] drivers: crypto: meson: add support for AES-CTR
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (10 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 11/24] drivers: crypto: meson: introduce hasher Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 13/24] drivers: crypto: meson: use fallback for 192-bit keys Alexey Romanov
` (13 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich, Alexey Romanov
From: Jan Dakinevich <yvdakinevich@salutedevices.com>
This patch adds support for AES-CTR algorithm.
Tested via tcrypt and custom tests.
Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 41 +++++++++++++++++++--
drivers/crypto/amlogic/amlogic-gxl.h | 1 +
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index 6ff0e088939f..b60b65034b6e 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -154,7 +154,7 @@ static void meson_setup_keyiv_descs(struct cipher_ctx *ctx)
if (ctx->tloffset)
return;
- if (blockmode == DESC_OPMODE_CBC) {
+ if (blockmode == DESC_OPMODE_CBC || blockmode == DESC_OPMODE_CTR) {
memcpy(op->keyiv + AES_MAX_KEY_SIZE, ctx->areq->iv, ivsize);
dma_sync_single_for_device(mc->dev, ctx->keyiv.addr,
ctx->keyiv.len, DMA_TO_DEVICE);
@@ -186,6 +186,7 @@ static bool meson_setup_data_descs(struct cipher_ctx *ctx)
struct meson_desc *desc = &mc->chanlist[rctx->flow].tl[ctx->tloffset];
unsigned int blocksize = crypto_skcipher_blocksize(tfm);
unsigned int blockmode = algt->blockmode;
+ unsigned int ivsize = crypto_skcipher_ivsize(tfm);
unsigned int maxlen = rounddown(DESC_MAXLEN, blocksize);
unsigned int todo;
u32 v;
@@ -204,8 +205,15 @@ static bool meson_setup_data_descs(struct cipher_ctx *ctx)
ctx->src_offset += todo;
ctx->dst_offset += todo;
+ if (blockmode == DESC_OPMODE_CTR) {
+ unsigned int nblocks = todo / blocksize;
+
+ while (nblocks--)
+ crypto_inc(ctx->areq->iv, ivsize);
+ }
+
v = DESC_OWN | blockmode | op->keymode | todo;
- if (rctx->op_dir == MESON_ENCRYPT)
+ if (rctx->op_dir == MESON_ENCRYPT || blockmode == DESC_OPMODE_CTR)
v |= DESC_ENCRYPTION;
if (!ctx->cryptlen || ctx->tloffset == MAXDESC)
@@ -322,7 +330,8 @@ static int meson_cipher(struct skcipher_request *areq)
if (ctx.keyiv.len == AES_KEYSIZE_192)
ctx.keyiv.len = AES_MAX_KEY_SIZE;
- if (algt->blockmode == DESC_OPMODE_CBC) {
+ if (algt->blockmode == DESC_OPMODE_CBC ||
+ algt->blockmode == DESC_OPMODE_CTR) {
memcpy(op->keyiv + AES_MAX_KEY_SIZE, areq->iv, ivsize);
ctx.keyiv.len = AES_MAX_KEY_SIZE + ivsize;
}
@@ -534,6 +543,32 @@ static struct meson_alg_template algs[] = {
.decrypt = meson_skdecrypt,
}
},
+{
+ .type = CRYPTO_ALG_TYPE_SKCIPHER,
+ .blockmode = DESC_OPMODE_CTR,
+ .alg.skcipher = {
+ .base = {
+ .cra_name = "ctr(aes)",
+ .cra_driver_name = "ctr-aes-gxl",
+ .cra_priority = 400,
+ .cra_blocksize = AES_BLOCK_SIZE,
+ .cra_flags = CRYPTO_ALG_TYPE_SKCIPHER |
+ CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY |
+ CRYPTO_ALG_NEED_FALLBACK,
+ .cra_ctxsize = sizeof(struct meson_cipher_tfm_ctx),
+ .cra_module = THIS_MODULE,
+ .cra_alignmask = 0xf,
+ .cra_init = meson_cipher_init,
+ .cra_exit = meson_cipher_exit,
+ },
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
+ .setkey = meson_aes_setkey,
+ .encrypt = meson_skencrypt,
+ .decrypt = meson_skdecrypt,
+ }
+},
};
int meson_cipher_register(struct meson_dev *mc)
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 5d80471f6a6a..d9336718d813 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -24,6 +24,7 @@
#define DESC_OPMODE_ECB (0 << 26)
#define DESC_OPMODE_CBC (1 << 26)
+#define DESC_OPMODE_CTR (2 << 26)
#define DESC_OPMODE_SHA (0 << 26)
#define DESC_MAXLEN ((1 << 17) - 1)
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 13/24] drivers: crypto: meson: use fallback for 192-bit keys
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (11 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 12/24] drivers: crypto: meson: add support for AES-CTR Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 14/24] drivers: crypto: meson: add support for G12-series Alexey Romanov
` (12 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
Unforunately, not all Amlogic SoC's have a 192-bit key
support for AES algo. In this case, use fallback.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 7 +++++++
drivers/crypto/amlogic/amlogic-gxl-core.c | 1 +
drivers/crypto/amlogic/amlogic-gxl.h | 2 ++
3 files changed, 10 insertions(+)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index b60b65034b6e..20ef3dfbaeb4 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
@@ -41,6 +41,13 @@ static bool meson_cipher_need_fallback_sg(struct skcipher_request *areq,
static bool meson_cipher_need_fallback(struct skcipher_request *areq)
{
+ struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
+ struct meson_cipher_tfm_ctx *op = crypto_skcipher_ctx(tfm);
+ struct meson_dev *mc = op->mc;
+
+ if (op->keymode == DESC_MODE_AES_192 && !mc->pdata->support_192bit_key)
+ return true;
+
if (areq->cryptlen == 0)
return true;
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index a2bc9299214a..202dd9f73e55 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -206,6 +206,7 @@ static const struct meson_pdata meson_gxl_pdata = {
.descs_reg = 0x0,
.status_reg = 0x4,
.setup_desc_cnt = 3,
+ .support_192bit_key = true,
};
static const struct of_device_id meson_crypto_of_match_table[] = {
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index d9336718d813..d4b2468b7e92 100644
--- a/drivers/crypto/amlogic/amlogic-gxl.h
+++ b/drivers/crypto/amlogic/amlogic-gxl.h
@@ -97,11 +97,13 @@ struct meson_flow {
* @reg_descs: offset to descriptors register
* @reg_status: offset to status register
* @setup_desc_cnt: number of setup descriptor to configure.
+ * @support_192bit_key: indicates whether platform support AES 192-bit key
*/
struct meson_pdata {
u32 descs_reg;
u32 status_reg;
u32 setup_desc_cnt;
+ bool support_192bit_key;
};
/*
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 14/24] drivers: crypto: meson: add support for G12-series
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (12 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 13/24] drivers: crypto: meson: use fallback for 192-bit keys Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 15/24] drivers: crypto: meson: add support for AXG-series Alexey Romanov
` (11 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
This platform data also can be used for SM1, A1 and S4.
Tested via tcrypt module and with custom tests.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-core.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index 202dd9f73e55..4826f15448f9 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -209,11 +209,22 @@ static const struct meson_pdata meson_gxl_pdata = {
.support_192bit_key = true,
};
+static const struct meson_pdata meson_g12a_pdata = {
+ .descs_reg = 0x0,
+ .status_reg = 0x8,
+ .setup_desc_cnt = 1,
+ .support_192bit_key = false,
+};
+
static const struct of_device_id meson_crypto_of_match_table[] = {
{
.compatible = "amlogic,gxl-crypto",
.data = &meson_gxl_pdata,
},
+ {
+ .compatible = "amlogic,g12a-crypto",
+ .data = &meson_g12a_pdata,
+ },
{},
};
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 15/24] drivers: crypto: meson: add support for AXG-series
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (13 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 14/24] drivers: crypto: meson: add support for G12-series Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles Alexey Romanov
` (10 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
Tested via tcrypt module and with custom tests.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
drivers/crypto/amlogic/amlogic-gxl-core.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
index 4826f15448f9..6b0ac2bf81ea 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -216,6 +216,13 @@ static const struct meson_pdata meson_g12a_pdata = {
.support_192bit_key = false,
};
+static const struct meson_pdata meson_axg_pdata = {
+ .descs_reg = 0x0,
+ .status_reg = 0x8,
+ .setup_desc_cnt = 3,
+ .support_192bit_key = true,
+};
+
static const struct of_device_id meson_crypto_of_match_table[] = {
{
.compatible = "amlogic,gxl-crypto",
@@ -225,6 +232,10 @@ static const struct of_device_id meson_crypto_of_match_table[] = {
.compatible = "amlogic,g12a-crypto",
.data = &meson_g12a_pdata,
},
+ {
+ .compatible = "amlogic,axg-crypto",
+ .data = &meson_axg_pdata,
+ },
{},
};
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (14 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 15/24] drivers: crypto: meson: add support for AXG-series Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 21:25 ` Rob Herring
` (2 more replies)
2024-01-10 20:11 ` [PATCH v1 17/24] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
` (9 subsequent siblings)
25 siblings, 3 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
Now we can use crypto driver at G12A/G12B/S4/A1/SM1/AXG.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
.../devicetree/bindings/crypto/amlogic,gxl-crypto.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml b/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
index 948e11ebe4ee..317003505510 100644
--- a/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
+++ b/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
@@ -13,6 +13,8 @@ properties:
compatible:
items:
- const: amlogic,gxl-crypto
+ - const: amlogic,g12a-crypto
+ - const: amlogic,axg-crypto
reg:
maxItems: 1
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 17/24] arch: arm64: dts: meson: a1: add crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (15 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-11 8:16 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 18/24] arch: arm64: dts: meson: s4: " Alexey Romanov
` (8 subsequent siblings)
25 siblings, 1 reply; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
This patch adds a crypto node declaration. With the
Amlogic crypto driver we can use HW implementation
of SHA1/224/256 and AES algo.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
index cf150f568335..879e0ce0b2ea 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
@@ -653,6 +653,14 @@ sd_emmc: sd@10000 {
power-domains = <&pwrc PWRC_SD_EMMC_ID>;
status = "disabled";
};
+
+ crypto: crypto@6000 {
+ compatible = "amlogic,g12a-crypto";
+ reg = <0x0 0x6000 0x0 0x48>;
+ interrupts = <GIC_SPI 120 IRQ_TYPE_EDGE_RISING>;
+ power-domains = <&pwrc PWRC_DMA_ID>;
+ status = "disabled";
+ };
};
usb: usb@fe004400 {
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 18/24] arch: arm64: dts: meson: s4: add crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (16 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 17/24] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 19/24] arch: arm64: dts: meson: g12: " Alexey Romanov
` (7 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
This patch adds a crypto node declaration for Amlogic S4-series.
With the Amlogic crypto driver we can use HW implementation
of SHA1/224/256 and AES algo.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index b3a1ecf36467..8ad910fcbc8f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -108,6 +108,13 @@ gpio: bank@4000 {
};
};
+ crypto: crypto@440400 {
+ compatible = "amlogic,g12a-crypto";
+ reg = <0x0 0x440400 0x0 0x48>;
+ interrupts = <GIC_SPI 24 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
+ };
+
gpio_intc: interrupt-controller@4080 {
compatible = "amlogic,meson-s4-gpio-intc",
"amlogic,meson-gpio-intc";
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 19/24] arch: arm64: dts: meson: g12: add crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (17 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 18/24] arch: arm64: dts: meson: s4: " Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 20/24] arch: arm64: dts: meson: axg: " Alexey Romanov
` (6 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
This patch adds a crypto node declaration for Amlogic G12-series.
With the Amlogic crypto driver we can use HW implementation
of SHA1/224/256 and AES algo.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 0c49655cc90c..cc319cfdb2ad 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -1708,6 +1708,13 @@ internal_ephy: ethernet-phy@8 {
};
};
};
+
+ crypto: crypto@3e000 {
+ compatible = "amlogic,g12a-crypto";
+ reg = <0x0 0x3e000 0x0 0x48>;
+ interrupts = <GIC_SPI 180 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
+ };
};
aobus: bus@ff800000 {
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 20/24] arch: arm64: dts: meson: axg: add crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (18 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 19/24] arch: arm64: dts: meson: g12: " Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 21/24] arch: arm64: dts: meson: s4-s805x2-aq222: enable " Alexey Romanov
` (5 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
This patch adds a crypto node declaration. With the
Amlogic crypto driver we can use HW implementation
of SHA1/224/256 and AES algo.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index 7e5ac9db93f8..d5dd2cf1af64 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -286,6 +286,13 @@ ethmac: ethernet@ff3f0000 {
status = "disabled";
};
+ crypto: crypto@ff63e000 {
+ compatible = "amlogic,axg-crypto";
+ reg = <0x0 0xff63e000 0x0 0x48>;
+ interrupts = <GIC_SPI 180 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
+ };
+
pcie_phy: phy@ff644000 {
compatible = "amlogic,axg-pcie-phy";
reg = <0x0 0xff644000 0x0 0x1c>;
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 21/24] arch: arm64: dts: meson: s4-s805x2-aq222: enable crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (19 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 20/24] arch: arm64: dts: meson: axg: " Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 22/24] arch: arm64: dts: meson: a1-ad401: " Alexey Romanov
` (4 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
S4 has hardware support of crypto algos: SHA1/224/256 and AES.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
index 8ffbcb2b1ac5..83fb11cf6aba 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
@@ -28,3 +28,7 @@ memory@0 {
&uart_B {
status = "okay";
};
+
+&crypto {
+ status = "okay";
+};
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 22/24] arch: arm64: dts: meson: a1-ad401: enable crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (20 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 21/24] arch: arm64: dts: meson: s4-s805x2-aq222: enable " Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 23/24] arch: arm64: dts: meson: axg-s400: " Alexey Romanov
` (3 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
A1 has hardware support of crypto algos: SHA1/224/256 and AES.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts b/arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts
index 69c25c68c358..69faf7b403fc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-a1-ad401.dts
@@ -28,3 +28,7 @@ memory@0 {
&uart_AO_B {
status = "okay";
};
+
+&crypto {
+ status = "okay";
+};
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 23/24] arch: arm64: dts: meson: axg-s400: enable crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (21 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 22/24] arch: arm64: dts: meson: a1-ad401: " Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 24/24] arch: arm64: dts: meson: g12a-u200: " Alexey Romanov
` (2 subsequent siblings)
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
AXG has hardware support of crypto algos: SHA1/224/256 and AES.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 359589d1dfa9..d8f2289d7452 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -600,3 +600,7 @@ &usb {
dr_mode = "otg";
vbus-supply = <&usb_pwr>;
};
+
+&crypto {
+ status = "okay";
+};
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH v1 24/24] arch: arm64: dts: meson: g12a-u200: enable crypto node
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (22 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 23/24] arch: arm64: dts: meson: axg-s400: " Alexey Romanov
@ 2024-01-10 20:11 ` Alexey Romanov
2024-01-10 21:08 ` [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Corentin Labbe
2024-01-11 8:19 ` neil.armstrong
25 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-10 20:11 UTC (permalink / raw)
To: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Alexey Romanov
G12A has hardware support of crypto algos: SHA1/224/256 and AES.
Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
---
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
index 4b5d11e56364..cb01943a0fda 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
@@ -306,3 +306,7 @@ &usb2_phy0 {
&usb2_phy1 {
phy-supply = <&vcc_5v>;
};
+
+&crypto {
+ status = "okay";
+};
--
2.30.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* Re: [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (23 preceding siblings ...)
2024-01-10 20:11 ` [PATCH v1 24/24] arch: arm64: dts: meson: g12a-u200: " Alexey Romanov
@ 2024-01-10 21:08 ` Corentin Labbe
2024-01-11 9:18 ` Alexey Romanov
2024-01-11 8:19 ` neil.armstrong
25 siblings, 1 reply; 37+ messages in thread
From: Corentin Labbe @ 2024-01-10 21:08 UTC (permalink / raw)
To: Alexey Romanov
Cc: narmstrong, neil.armstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl, linux-crypto, linux-amlogic, linux-kernel,
devicetree, linux-arm-kernel, kernel
Le Wed, Jan 10, 2024 at 11:11:16PM +0300, Alexey Romanov a écrit :
> Hello!
>
> This patchset expand the funcionality of the Amlogic
> crypto driver by adding support for more SoC families:
> AXG, G12A, G12B, SM1, A1, S4.
>
> Also specify and enable crypto node in device tree
> for reference Amlogic devices.
>
> Tested on AXG, G12A/B, SM1, A1 and S4 devices via
> custom tests and trcypt module.
Hello
Thanks for your patch series.
Unfortunatly, I fail to apply it for testing on top of linux-next.
On top of which tree did you have tested ?
According to patch 01, you used a tree based before "crypto: amlogic - Use new crypto_engine_op interface" so too old.
Regards
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles
2024-01-10 20:11 ` [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles Alexey Romanov
@ 2024-01-10 21:25 ` Rob Herring
2024-01-11 1:44 ` Rob Herring
2024-01-11 8:15 ` neil.armstrong
2 siblings, 0 replies; 37+ messages in thread
From: Rob Herring @ 2024-01-10 21:25 UTC (permalink / raw)
To: Alexey Romanov
Cc: kernel, herbert, davem, neil.armstrong, linux-arm-kernel,
linux-crypto, khilman, robh+dt, linux-amlogic,
krzysztof.kozlowski+dt, conor+dt, narmstrong, clabbe, jbrunet,
devicetree, linux-kernel, artin.blumenstingl
On Wed, 10 Jan 2024 23:11:32 +0300, Alexey Romanov wrote:
> Now we can use crypto driver at G12A/G12B/S4/A1/SM1/AXG.
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> .../devicetree/bindings/crypto/amlogic,gxl-crypto.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.example.dtb: crypto-engine@c883e000: compatible: ['amlogic,gxl-crypto'] is too short
from schema $id: http://devicetree.org/schemas/crypto/amlogic,gxl-crypto.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20240110201216.18016-17-avromanov@salutedevices.com
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles
2024-01-10 20:11 ` [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles Alexey Romanov
2024-01-10 21:25 ` Rob Herring
@ 2024-01-11 1:44 ` Rob Herring
2024-01-11 8:15 ` neil.armstrong
2 siblings, 0 replies; 37+ messages in thread
From: Rob Herring @ 2024-01-11 1:44 UTC (permalink / raw)
To: Alexey Romanov
Cc: narmstrong, neil.armstrong, clabbe, herbert, davem,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl, linux-crypto, linux-amlogic, linux-kernel,
devicetree, linux-arm-kernel, kernel
On Wed, Jan 10, 2024 at 11:11:32PM +0300, Alexey Romanov wrote:
> Now we can use crypto driver at G12A/G12B/S4/A1/SM1/AXG.
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> .../devicetree/bindings/crypto/amlogic,gxl-crypto.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml b/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
> index 948e11ebe4ee..317003505510 100644
> --- a/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
> +++ b/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
> @@ -13,6 +13,8 @@ properties:
> compatible:
> items:
> - const: amlogic,gxl-crypto
> + - const: amlogic,g12a-crypto
> + - const: amlogic,axg-crypto
You need an 'enum'.
>
> reg:
> maxItems: 1
> --
> 2.30.1
>
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles
2024-01-10 20:11 ` [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles Alexey Romanov
2024-01-10 21:25 ` Rob Herring
2024-01-11 1:44 ` Rob Herring
@ 2024-01-11 8:15 ` neil.armstrong
2 siblings, 0 replies; 37+ messages in thread
From: neil.armstrong @ 2024-01-11 8:15 UTC (permalink / raw)
To: Alexey Romanov, narmstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel
Hi,
On 10/01/2024 21:11, Alexey Romanov wrote:
> Now we can use crypto driver at G12A/G12B/S4/A1/SM1/AXG.
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> .../devicetree/bindings/crypto/amlogic,gxl-crypto.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml b/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
> index 948e11ebe4ee..317003505510 100644
> --- a/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
> +++ b/Documentation/devicetree/bindings/crypto/amlogic,gxl-crypto.yaml
> @@ -13,6 +13,8 @@ properties:
> compatible:
> items:
> - const: amlogic,gxl-crypto
> + - const: amlogic,g12a-crypto
> + - const: amlogic,axg-crypto
Please add amlogic,s4-crypto and amlogic,a1-crypto using amlogic,g12a-crypto as fallback,
it's a requirement for dt bindings to have per-soc compatibles now.
Thanks,
Neil
>
> reg:
> maxItems: 1
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 17/24] arch: arm64: dts: meson: a1: add crypto node
2024-01-10 20:11 ` [PATCH v1 17/24] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
@ 2024-01-11 8:16 ` neil.armstrong
0 siblings, 0 replies; 37+ messages in thread
From: neil.armstrong @ 2024-01-11 8:16 UTC (permalink / raw)
To: Alexey Romanov, narmstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel
On 10/01/2024 21:11, Alexey Romanov wrote:
> This patch adds a crypto node declaration. With the
> Amlogic crypto driver we can use HW implementation
> of SHA1/224/256 and AES algo.
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
> index cf150f568335..879e0ce0b2ea 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
> @@ -653,6 +653,14 @@ sd_emmc: sd@10000 {
> power-domains = <&pwrc PWRC_SD_EMMC_ID>;
> status = "disabled";
> };
> +
> + crypto: crypto@6000 {
> + compatible = "amlogic,g12a-crypto";
> + reg = <0x0 0x6000 0x0 0x48>;
> + interrupts = <GIC_SPI 120 IRQ_TYPE_EDGE_RISING>;
> + power-domains = <&pwrc PWRC_DMA_ID>;
> + status = "disabled";
Why disabled ? Usually we always leave the embedded HW enabled by default.
The comment is valid for the other dtsi changes,
Neil
> + };
> };
>
> usb: usb@fe004400 {
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
` (24 preceding siblings ...)
2024-01-10 21:08 ` [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Corentin Labbe
@ 2024-01-11 8:19 ` neil.armstrong
2024-01-11 9:33 ` Alexey Romanov
25 siblings, 1 reply; 37+ messages in thread
From: neil.armstrong @ 2024-01-11 8:19 UTC (permalink / raw)
To: Alexey Romanov, narmstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel
Hi !
On 10/01/2024 21:11, Alexey Romanov wrote:
> Hello!
>
> This patchset expand the funcionality of the Amlogic
> crypto driver by adding support for more SoC families:
> AXG, G12A, G12B, SM1, A1, S4.
>
> Also specify and enable crypto node in device tree
> for reference Amlogic devices.
>
> Tested on AXG, G12A/B, SM1, A1 and S4 devices via
> custom tests and trcypt module.
Thanks a lot for the patchset, it's very welcome!
Could you provide some procedure used to test and test dumps for all the platforms, like `cryptsetup benchmark` or a summary of tcrypt tests output ?
Thanks,
Neil
>
> Alexey Romanov (17):
> drivers: crypto: meson: don't hardcode IRQ count
> drivers: crypto: meson: make CLK controller optional
> drviers: crypto: meson: add platform data
> drivers: crypto: meson: add MMIO helpers
> drivers: crypto: meson: move get_engine_number()
> drivers: crypto: meson: use fallback for 192-bit keys
> drivers: crypto: meson: add support for G12-series
> drivers: crypto: meson: add support for AXG-series
> dt-bindings: crypto: meson: add new compatibles
> arch: arm64: dts: meson: a1: add crypto node
> arch: arm64: dts: meson: s4: add crypto node
> arch: arm64: dts: meson: g12: add crypto node
> arch: arm64: dts: meson: axg: add crypto node
> arch: arm64: dts: meson: s4-s805x2-aq222: enable crypto node
> arch: arm64: dts: meson: a1-ad401: enable crypto node
> arch: arm64: dts: meson: axg-s400: enable crypto node
> arch: arm64: dts: meson: g12a-u200: enable crypto node
>
> Jan Dakinevich (7):
> drivers: crypto: meson: drop status field from meson_flow
> drivers: crypto: meson: move algs definition and cipher API to
> cipher.c
> drivers: crypto: meson: cleanup defines
> drivers: crypto: meson: process more than MAXDESCS descriptors
> drivers: crypto: meson: avoid kzalloc in engine thread
> drivers: crypto: meson: introduce hasher
> drivers: crypto: meson: add support for AES-CTR
>
> .../bindings/crypto/amlogic,gxl-crypto.yaml | 2 +
> .../arm64/boot/dts/amlogic/meson-a1-ad401.dts | 4 +
> arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 8 +
> .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +
> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 7 +
> .../boot/dts/amlogic/meson-g12-common.dtsi | 7 +
> .../boot/dts/amlogic/meson-g12a-u200.dts | 4 +
> .../dts/amlogic/meson-s4-s805x2-aq222.dts | 4 +
> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 7 +
> drivers/crypto/amlogic/Makefile | 2 +-
> drivers/crypto/amlogic/amlogic-gxl-cipher.c | 591 ++++++++++++------
> drivers/crypto/amlogic/amlogic-gxl-core.c | 260 ++++----
> drivers/crypto/amlogic/amlogic-gxl-hasher.c | 448 +++++++++++++
> drivers/crypto/amlogic/amlogic-gxl.h | 116 +++-
> 14 files changed, 1135 insertions(+), 329 deletions(-)
> create mode 100644 drivers/crypto/amlogic/amlogic-gxl-hasher.c
>
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 02/24] drivers: crypto: meson: make CLK controller optional
2024-01-10 20:11 ` [PATCH v1 02/24] drivers: crypto: meson: make CLK controller optional Alexey Romanov
@ 2024-01-11 8:20 ` neil.armstrong
0 siblings, 0 replies; 37+ messages in thread
From: neil.armstrong @ 2024-01-11 8:20 UTC (permalink / raw)
To: Alexey Romanov, narmstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich
On 10/01/2024 21:11, Alexey Romanov wrote:
> Not all Amlogic SoC's uses CLK controller.
In this case you must make clocks not required for the new platforms in the bindings.
Neil
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
> ---
> drivers/crypto/amlogic/amlogic-gxl-core.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
> index a5df061f9890..e5f504fb477e 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl-core.c
> +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
> @@ -248,16 +248,10 @@ static int meson_crypto_probe(struct platform_device *pdev)
> dev_err(&pdev->dev, "Cannot request MMIO err=%d\n", err);
> return err;
> }
> - mc->busclk = devm_clk_get(&pdev->dev, "blkmv");
> + mc->busclk = devm_clk_get_optional_enabled(&pdev->dev, "blkmv");
> if (IS_ERR(mc->busclk)) {
> err = PTR_ERR(mc->busclk);
> - dev_err(&pdev->dev, "Cannot get core clock err=%d\n", err);
> - return err;
> - }
> -
> - err = clk_prepare_enable(mc->busclk);
> - if (err != 0) {
> - dev_err(&pdev->dev, "Cannot prepare_enable busclk\n");
> + dev_err(&pdev->dev, "Cannot get and enable core clock err=%d\n", err);
> return err;
> }
>
> @@ -279,7 +273,6 @@ static int meson_crypto_probe(struct platform_device *pdev)
> meson_unregister_algs(mc);
> error_flow:
> meson_free_chanlist(mc, mc->flow_cnt - 1);
> - clk_disable_unprepare(mc->busclk);
> return err;
> }
>
> @@ -295,7 +288,6 @@ static int meson_crypto_remove(struct platform_device *pdev)
>
> meson_free_chanlist(mc, mc->flow_cnt - 1);
>
> - clk_disable_unprepare(mc->busclk);
> return 0;
> }
>
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count
2024-01-10 20:11 ` [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
@ 2024-01-11 8:21 ` neil.armstrong
0 siblings, 0 replies; 37+ messages in thread
From: neil.armstrong @ 2024-01-11 8:21 UTC (permalink / raw)
To: Alexey Romanov, narmstrong, clabbe, herbert, davem, robh+dt,
krzysztof.kozlowski+dt, conor+dt, khilman, jbrunet,
artin.blumenstingl
Cc: linux-crypto, linux-amlogic, linux-kernel, devicetree,
linux-arm-kernel, kernel, Jan Dakinevich
On 10/01/2024 21:11, Alexey Romanov wrote:
> IRQ count is no longer hardcoded, and make it part of
> struct meson_flow. We need this for extend driver support for
> other Amlogic SoC's.
In this case you must make the interrupts maxItems lower for the new platforms in the bindings.
Neil
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> Signed-off-by: Jan Dakinevich <yvdakinevich@salutedevices.com>
> ---
> drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +-
> drivers/crypto/amlogic/amlogic-gxl-core.c | 47 ++++++++++++---------
> drivers/crypto/amlogic/amlogic-gxl.h | 8 ++--
> 3 files changed, 31 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> index af017a087ebf..e01ed6347c3d 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> @@ -19,7 +19,7 @@
>
> static int get_engine_number(struct meson_dev *mc)
> {
> - return atomic_inc_return(&mc->flow) % MAXFLOW;
> + return atomic_inc_return(&mc->flow) % mc->flow_cnt;
> }
>
> static bool meson_cipher_need_fallback(struct skcipher_request *areq)
> diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c
> index 937187027ad5..a5df061f9890 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl-core.c
> +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
> @@ -26,8 +26,8 @@ static irqreturn_t meson_irq_handler(int irq, void *data)
> int flow;
> u32 p;
>
> - for (flow = 0; flow < MAXFLOW; flow++) {
> - if (mc->irqs[flow] == irq) {
> + for (flow = 0; flow < mc->flow_cnt; flow++) {
> + if (mc->chanlist[flow].irq == irq) {
> p = readl(mc->base + ((0x04 + flow) << 2));
> if (p) {
> writel_relaxed(0xF, mc->base + ((0x4 + flow) << 2));
> @@ -103,7 +103,7 @@ static int meson_debugfs_show(struct seq_file *seq, void *v)
> struct meson_dev *mc = seq->private;
> int i;
>
> - for (i = 0; i < MAXFLOW; i++)
> + for (i = 0; i < mc->flow_cnt; i++)
> seq_printf(seq, "Channel %d: nreq %lu\n", i, mc->chanlist[i].stat_req);
>
> for (i = 0; i < ARRAY_SIZE(mc_algs); i++) {
> @@ -138,14 +138,32 @@ static void meson_free_chanlist(struct meson_dev *mc, int i)
> */
> static int meson_allocate_chanlist(struct meson_dev *mc)
> {
> + struct platform_device *pdev = to_platform_device(mc->dev);
> int i, err;
>
> - mc->chanlist = devm_kcalloc(mc->dev, MAXFLOW,
> + mc->flow_cnt = platform_irq_count(pdev);
> + if (mc->flow_cnt <= 0) {
> + dev_err(mc->dev, "No IRQs defined\n");
> + return -ENODEV;
> + }
> +
> + mc->chanlist = devm_kcalloc(mc->dev, mc->flow_cnt,
> sizeof(struct meson_flow), GFP_KERNEL);
> if (!mc->chanlist)
> return -ENOMEM;
>
> - for (i = 0; i < MAXFLOW; i++) {
> + for (i = 0; i < mc->flow_cnt; i++) {
> + mc->chanlist[i].irq = platform_get_irq(pdev, i);
> + if (mc->chanlist[i].irq < 0)
> + return mc->chanlist[i].irq;
> +
> + err = devm_request_irq(mc->dev, mc->chanlist[i].irq,
> + meson_irq_handler, 0, "aml-crypto", mc);
> + if (err < 0) {
> + dev_err(mc->dev, "Cannot request IRQ for flow %d\n", i);
> + return err;
> + }
> +
> init_completion(&mc->chanlist[i].complete);
>
> mc->chanlist[i].engine = crypto_engine_alloc_init(mc->dev, true);
> @@ -215,7 +233,7 @@ static void meson_unregister_algs(struct meson_dev *mc)
> static int meson_crypto_probe(struct platform_device *pdev)
> {
> struct meson_dev *mc;
> - int err, i;
> + int err;
>
> mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
> if (!mc)
> @@ -237,19 +255,6 @@ static int meson_crypto_probe(struct platform_device *pdev)
> return err;
> }
>
> - for (i = 0; i < MAXFLOW; i++) {
> - mc->irqs[i] = platform_get_irq(pdev, i);
> - if (mc->irqs[i] < 0)
> - return mc->irqs[i];
> -
> - err = devm_request_irq(&pdev->dev, mc->irqs[i], meson_irq_handler, 0,
> - "gxl-crypto", mc);
> - if (err < 0) {
> - dev_err(mc->dev, "Cannot request IRQ for flow %d\n", i);
> - return err;
> - }
> - }
> -
> err = clk_prepare_enable(mc->busclk);
> if (err != 0) {
> dev_err(&pdev->dev, "Cannot prepare_enable busclk\n");
> @@ -273,7 +278,7 @@ static int meson_crypto_probe(struct platform_device *pdev)
> error_alg:
> meson_unregister_algs(mc);
> error_flow:
> - meson_free_chanlist(mc, MAXFLOW - 1);
> + meson_free_chanlist(mc, mc->flow_cnt - 1);
> clk_disable_unprepare(mc->busclk);
> return err;
> }
> @@ -288,7 +293,7 @@ static int meson_crypto_remove(struct platform_device *pdev)
>
> meson_unregister_algs(mc);
>
> - meson_free_chanlist(mc, MAXFLOW - 1);
> + meson_free_chanlist(mc, mc->flow_cnt - 1);
>
> clk_disable_unprepare(mc->busclk);
> return 0;
> diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
> index 8c0746a1d6d4..e5cc6e028fa8 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl.h
> +++ b/drivers/crypto/amlogic/amlogic-gxl.h
> @@ -22,8 +22,6 @@
> #define MESON_OPMODE_ECB 0
> #define MESON_OPMODE_CBC 1
>
> -#define MAXFLOW 2
> -
> #define MAXDESC 64
>
> #define DESC_LAST BIT(18)
> @@ -62,6 +60,7 @@ struct meson_desc {
> * @keylen: keylen for this flow operation
> * @complete: completion for the current task on this flow
> * @status: set to 1 by interrupt if task is done
> + * @irq: IRQ number for amlogic-crypto
> * @t_phy: Physical address of task
> * @tl: pointer to the current ce_task for this flow
> * @stat_req: number of request done by this flow
> @@ -70,6 +69,7 @@ struct meson_flow {
> struct crypto_engine *engine;
> struct completion complete;
> int status;
> + int irq;
> unsigned int keylen;
> dma_addr_t t_phy;
> struct meson_desc *tl;
> @@ -85,7 +85,7 @@ struct meson_flow {
> * @dev: the platform device
> * @chanlist: array of all flow
> * @flow: flow to use in next request
> - * @irqs: IRQ numbers for amlogic-crypto
> + * @flow_cnt: flow count for amlogic-crypto
> * @dbgfs_dir: Debugfs dentry for statistic directory
> * @dbgfs_stats: Debugfs dentry for statistic counters
> */
> @@ -95,7 +95,7 @@ struct meson_dev {
> struct device *dev;
> struct meson_flow *chanlist;
> atomic_t flow;
> - int irqs[MAXFLOW];
> + int flow_cnt;
> #ifdef CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG
> struct dentry *dbgfs_dir;
> #endif
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
2024-01-10 21:08 ` [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Corentin Labbe
@ 2024-01-11 9:18 ` Alexey Romanov
2024-01-11 9:29 ` Krzysztof Kozlowski
0 siblings, 1 reply; 37+ messages in thread
From: Alexey Romanov @ 2024-01-11 9:18 UTC (permalink / raw)
To: Corentin Labbe
Cc: narmstrong@baylibre.com, 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,
artin.blumenstingl@googlemail.com, 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
Hello!
On Wed, Jan 10, 2024 at 10:08:15PM +0100, Corentin Labbe wrote:
> Le Wed, Jan 10, 2024 at 11:11:16PM +0300, Alexey Romanov a 'ecrit :
> > Hello!
> >
> > This patchset expand the funcionality of the Amlogic
> > crypto driver by adding support for more SoC families:
> > AXG, G12A, G12B, SM1, A1, S4.
> >
> > Also specify and enable crypto node in device tree
> > for reference Amlogic devices.
> >
> > Tested on AXG, G12A/B, SM1, A1 and S4 devices via
> > custom tests and trcypt module.
>
> Hello
>
> Thanks for your patch series.
> Unfortunatly, I fail to apply it for testing on top of linux-next.
> On top of which tree did you have tested ?
We use 6.5-rc3.
> According to patch 01, you used a tree based before "crypto: amlogic - Use new crypto_engine_op interface" so too old.
Will rebase over linux-next in v2.
>
> Regards
--
Thank you,
Alexey
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
2024-01-11 9:18 ` Alexey Romanov
@ 2024-01-11 9:29 ` Krzysztof Kozlowski
2024-01-11 9:31 ` Krzysztof Kozlowski
0 siblings, 1 reply; 37+ messages in thread
From: Krzysztof Kozlowski @ 2024-01-11 9:29 UTC (permalink / raw)
To: Alexey Romanov, Corentin Labbe
Cc: narmstrong@baylibre.com, 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,
artin.blumenstingl@googlemail.com, 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
On 11/01/2024 10:18, Alexey Romanov wrote:
> Hello!
>
> On Wed, Jan 10, 2024 at 10:08:15PM +0100, Corentin Labbe wrote:
>> Le Wed, Jan 10, 2024 at 11:11:16PM +0300, Alexey Romanov a 'ecrit :
>>> Hello!
>>>
>>> This patchset expand the funcionality of the Amlogic
>>> crypto driver by adding support for more SoC families:
>>> AXG, G12A, G12B, SM1, A1, S4.
>>>
>>> Also specify and enable crypto node in device tree
>>> for reference Amlogic devices.
>>>
>>> Tested on AXG, G12A/B, SM1, A1 and S4 devices via
>>> custom tests and trcypt module.
>>
>> Hello
>>
>> Thanks for your patch series.
>> Unfortunatly, I fail to apply it for testing on top of linux-next.
>> On top of which tree did you have tested ?
>
> We use 6.5-rc3.
Don't develop on old trees... I mean, internally you can do whatever you
wish, but don't work upstream on such trees.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
2024-01-11 9:29 ` Krzysztof Kozlowski
@ 2024-01-11 9:31 ` Krzysztof Kozlowski
0 siblings, 0 replies; 37+ messages in thread
From: Krzysztof Kozlowski @ 2024-01-11 9:31 UTC (permalink / raw)
To: Alexey Romanov, Corentin Labbe
Cc: narmstrong@baylibre.com, 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,
artin.blumenstingl@googlemail.com, 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
On 11/01/2024 10:29, Krzysztof Kozlowski wrote:
> On 11/01/2024 10:18, Alexey Romanov wrote:
>> Hello!
>>
>> On Wed, Jan 10, 2024 at 10:08:15PM +0100, Corentin Labbe wrote:
>>> Le Wed, Jan 10, 2024 at 11:11:16PM +0300, Alexey Romanov a 'ecrit :
>>>> Hello!
>>>>
>>>> This patchset expand the funcionality of the Amlogic
>>>> crypto driver by adding support for more SoC families:
>>>> AXG, G12A, G12B, SM1, A1, S4.
>>>>
>>>> Also specify and enable crypto node in device tree
>>>> for reference Amlogic devices.
>>>>
>>>> Tested on AXG, G12A/B, SM1, A1 and S4 devices via
>>>> custom tests and trcypt module.
>>>
>>> Hello
>>>
>>> Thanks for your patch series.
>>> Unfortunatly, I fail to apply it for testing on top of linux-next.
>>> On top of which tree did you have tested ?
>>
>> We use 6.5-rc3.
>
> Don't develop on old trees... I mean, internally you can do whatever you
> wish, but don't work upstream on such trees.
Number of email bounces also prove the point: you did not Cc right
people due to work on some ancient files.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver
2024-01-11 8:19 ` neil.armstrong
@ 2024-01-11 9:33 ` Alexey Romanov
0 siblings, 0 replies; 37+ messages in thread
From: Alexey Romanov @ 2024-01-11 9:33 UTC (permalink / raw)
To: neil.armstrong@linaro.org
Cc: narmstrong@baylibre.com, 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,
artin.blumenstingl@googlemail.com, 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
Hi Neil,
On Thu, Jan 11, 2024 at 09:19:11AM +0100, neil.armstrong@linaro.org wrote:
> Hi !
>
> On 10/01/2024 21:11, Alexey Romanov wrote:
> > Hello!
> >
> > This patchset expand the funcionality of the Amlogic
> > crypto driver by adding support for more SoC families:
> > AXG, G12A, G12B, SM1, A1, S4.
> >
> > Also specify and enable crypto node in device tree
> > for reference Amlogic devices.
> >
> > Tested on AXG, G12A/B, SM1, A1 and S4 devices via
> > custom tests and trcypt module.
>
> Thanks a lot for the patchset, it's very welcome!
>
> Could you provide some procedure used to test and test dumps for all the platforms, like `cryptsetup benchmark` or a summary of tcrypt tests output ?
We use the following kernel module:
https://gist.github.com/mRrvz/8d9277d57abb4d21568725785ec9e939
and don't forget to define reserved memory region in device tree.
>
> Thanks,
> Neil
>
> >
> > Alexey Romanov (17):
> > drivers: crypto: meson: don't hardcode IRQ count
> > drivers: crypto: meson: make CLK controller optional
> > drviers: crypto: meson: add platform data
> > drivers: crypto: meson: add MMIO helpers
> > drivers: crypto: meson: move get_engine_number()
> > drivers: crypto: meson: use fallback for 192-bit keys
> > drivers: crypto: meson: add support for G12-series
> > drivers: crypto: meson: add support for AXG-series
> > dt-bindings: crypto: meson: add new compatibles
> > arch: arm64: dts: meson: a1: add crypto node
> > arch: arm64: dts: meson: s4: add crypto node
> > arch: arm64: dts: meson: g12: add crypto node
> > arch: arm64: dts: meson: axg: add crypto node
> > arch: arm64: dts: meson: s4-s805x2-aq222: enable crypto node
> > arch: arm64: dts: meson: a1-ad401: enable crypto node
> > arch: arm64: dts: meson: axg-s400: enable crypto node
> > arch: arm64: dts: meson: g12a-u200: enable crypto node
> >
> > Jan Dakinevich (7):
> > drivers: crypto: meson: drop status field from meson_flow
> > drivers: crypto: meson: move algs definition and cipher API to
> > cipher.c
> > drivers: crypto: meson: cleanup defines
> > drivers: crypto: meson: process more than MAXDESCS descriptors
> > drivers: crypto: meson: avoid kzalloc in engine thread
> > drivers: crypto: meson: introduce hasher
> > drivers: crypto: meson: add support for AES-CTR
> >
> > .../bindings/crypto/amlogic,gxl-crypto.yaml | 2 +
> > .../arm64/boot/dts/amlogic/meson-a1-ad401.dts | 4 +
> > arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 8 +
> > .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +
> > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 7 +
> > .../boot/dts/amlogic/meson-g12-common.dtsi | 7 +
> > .../boot/dts/amlogic/meson-g12a-u200.dts | 4 +
> > .../dts/amlogic/meson-s4-s805x2-aq222.dts | 4 +
> > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 7 +
> > drivers/crypto/amlogic/Makefile | 2 +-
> > drivers/crypto/amlogic/amlogic-gxl-cipher.c | 591 ++++++++++++------
> > drivers/crypto/amlogic/amlogic-gxl-core.c | 260 ++++----
> > drivers/crypto/amlogic/amlogic-gxl-hasher.c | 448 +++++++++++++
> > drivers/crypto/amlogic/amlogic-gxl.h | 116 +++-
> > 14 files changed, 1135 insertions(+), 329 deletions(-)
> > create mode 100644 drivers/crypto/amlogic/amlogic-gxl-hasher.c
> >
>
--
Thank you,
Alexey
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2024-01-11 9:33 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-10 20:11 [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 01/24] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
2024-01-11 8:21 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 02/24] drivers: crypto: meson: make CLK controller optional Alexey Romanov
2024-01-11 8:20 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 03/24] drviers: crypto: meson: add platform data Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 04/24] drivers: crypto: meson: add MMIO helpers Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 05/24] drivers: crypto: meson: move get_engine_number() Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 06/24] drivers: crypto: meson: drop status field from meson_flow Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 07/24] drivers: crypto: meson: move algs definition and cipher API to cipher.c Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 08/24] drivers: crypto: meson: cleanup defines Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 09/24] drivers: crypto: meson: process more than MAXDESCS descriptors Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 10/24] drivers: crypto: meson: avoid kzalloc in engine thread Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 11/24] drivers: crypto: meson: introduce hasher Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 12/24] drivers: crypto: meson: add support for AES-CTR Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 13/24] drivers: crypto: meson: use fallback for 192-bit keys Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 14/24] drivers: crypto: meson: add support for G12-series Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 15/24] drivers: crypto: meson: add support for AXG-series Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 16/24] dt-bindings: crypto: meson: add new compatibles Alexey Romanov
2024-01-10 21:25 ` Rob Herring
2024-01-11 1:44 ` Rob Herring
2024-01-11 8:15 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 17/24] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
2024-01-11 8:16 ` neil.armstrong
2024-01-10 20:11 ` [PATCH v1 18/24] arch: arm64: dts: meson: s4: " Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 19/24] arch: arm64: dts: meson: g12: " Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 20/24] arch: arm64: dts: meson: axg: " Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 21/24] arch: arm64: dts: meson: s4-s805x2-aq222: enable " Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 22/24] arch: arm64: dts: meson: a1-ad401: " Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 23/24] arch: arm64: dts: meson: axg-s400: " Alexey Romanov
2024-01-10 20:11 ` [PATCH v1 24/24] arch: arm64: dts: meson: g12a-u200: " Alexey Romanov
2024-01-10 21:08 ` [PATCH v1 00/24] Support more Amlogic SoC families in crypto driver Corentin Labbe
2024-01-11 9:18 ` Alexey Romanov
2024-01-11 9:29 ` Krzysztof Kozlowski
2024-01-11 9:31 ` Krzysztof Kozlowski
2024-01-11 8:19 ` neil.armstrong
2024-01-11 9:33 ` Alexey Romanov
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).