From: Alexey Romanov <avromanov@salutedevices.com>
To: <neil.armstrong@linaro.org>, <clabbe@baylibre.com>,
<herbert@gondor.apana.org.au>, <davem@davemloft.net>,
<robh+dt@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>,
<conor+dt@kernel.org>, <khilman@baylibre.com>,
<jbrunet@baylibre.com>, <martin.blumenstingl@googlemail.com>,
<vadim.fedorenko@linux.dev>
Cc: <linux-crypto@vger.kernel.org>,
<linux-amlogic@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<kernel@salutedevices.com>,
Alexey Romanov <avromanov@salutedevices.com>
Subject: [PATCH v7 02/23] drviers: crypto: meson: add platform data
Date: Thu, 11 Apr 2024 16:38:11 +0300 [thread overview]
Message-ID: <20240411133832.2896463-3-avromanov@salutedevices.com> (raw)
In-Reply-To: <20240411133832.2896463-1-avromanov@salutedevices.com>
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>
---
drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +-
drivers/crypto/amlogic/amlogic-gxl-core.c | 22 +++++++++++++++++----
drivers/crypto/amlogic/amlogic-gxl.h | 11 +++++++++++
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
index b19032f92415..7eff3ae7356f 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 35ec64df5b3a..e9e733ed98e0 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include "amlogic-gxl.h"
@@ -30,9 +31,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;
@@ -254,6 +256,10 @@ static int meson_crypto_probe(struct platform_device *pdev)
if (!mc)
return -ENOMEM;
+ mc->pdata = of_device_get_match_data(&pdev->dev);
+ if (!mc->pdata)
+ return -EINVAL;
+
mc->dev = &pdev->dev;
platform_set_drvdata(pdev, mc);
@@ -319,9 +325,17 @@ static void meson_crypto_remove(struct platform_device *pdev)
clk_disable_unprepare(mc->busclk);
}
+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", },
- {}
+ {
+ .compatible = "amlogic,gxl-crypto",
+ .data = &meson_gxl_pdata,
+ },
+ {},
};
MODULE_DEVICE_TABLE(of, meson_crypto_of_match_table);
diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h
index 79177cfa8b88..9ad75da214ff 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.34.1
next prev parent reply other threads:[~2024-04-11 13:38 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 13:38 [PATCH v7 00/23] Support more Amlogic SoC families in crypto driver Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 01/23] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
2024-04-11 13:38 ` Alexey Romanov [this message]
2024-04-11 13:38 ` [PATCH v7 03/23] drivers: crypto: meson: remove clock input Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 04/23] drivers: crypto: meson: add MMIO helpers Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 05/23] drivers: crypto: meson: move get_engine_number() Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 06/23] drivers: crypto: meson: drop status field from meson_flow Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 07/23] drivers: crypto: meson: move algs definition and cipher API to cipher.c Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 08/23] drivers: crypto: meson: cleanup defines Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 09/23] drivers: crypto: meson: process more than MAXDESCS descriptors Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 10/23] drivers: crypto: meson: avoid kzalloc in engine thread Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 11/23] drivers: crypto: meson: introduce hasher Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 12/23] drivers: crypto: meson: add support for AES-CTR Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 13/23] drivers: crypto: meson: use fallback for 192-bit keys Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 14/23] drivers: crypto: meson: add support for G12-series Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 15/23] drivers: crypto: meson: add support for AXG-series Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 16/23] drivers: crypto: meson: add support for A1-series Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 17/23] dt-bindings: crypto: meson: remove clk and second interrupt line for GXL Alexey Romanov
2024-04-15 16:43 ` Conor Dooley
2024-05-06 13:48 ` Alexey Romanov
2024-05-06 15:47 ` Conor Dooley
2024-04-11 13:38 ` [PATCH v7 18/23] arch: arm64: dts: meson: gxl: correct crypto node definition Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 19/23] dt-bindings: crypto: meson: support new SoC's Alexey Romanov
2024-04-15 16:44 ` Conor Dooley
2024-04-11 13:38 ` [PATCH v7 20/23] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 21/23] arch: arm64: dts: meson: s4: " Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 22/23] arch: arm64: dts: meson: g12: " Alexey Romanov
2024-04-11 13:38 ` [PATCH v7 23/23] arch: arm64: dts: meson: axg: " Alexey Romanov
2024-04-12 2:53 ` [PATCH v7 00/23] Support more Amlogic SoC families in crypto driver Herbert Xu
2024-04-12 8:19 ` Alexey Romanov
2024-04-12 8:22 ` Herbert Xu
2024-04-12 8:25 ` Alexey Romanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240411133832.2896463-3-avromanov@salutedevices.com \
--to=avromanov@salutedevices.com \
--cc=clabbe@baylibre.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=jbrunet@baylibre.com \
--cc=kernel@salutedevices.com \
--cc=khilman@baylibre.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=neil.armstrong@linaro.org \
--cc=robh+dt@kernel.org \
--cc=vadim.fedorenko@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).