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 v4 04/20] drivers: crypto: meson: add MMIO helpers
Date: Mon, 12 Feb 2024 16:50:52 +0300 [thread overview]
Message-ID: <20240212135108.549755-5-avromanov@salutedevices.com> (raw)
In-Reply-To: <20240212135108.549755-1-avromanov@salutedevices.com>
Add MMIO access helpers: meson_dma_start() and meson_dma_ready().
Signed-off-by: Alexey Romanov <avromanov@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 7eff3ae7356f..1fe916b0a138 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 54113c524ec5..372c30f72072 100644
--- a/drivers/crypto/amlogic/amlogic-gxl-core.c
+++ b/drivers/crypto/amlogic/amlogic-gxl-core.c
@@ -23,18 +23,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 a36b9bac63a0..59fc6a67e0a9 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.34.1
next prev parent reply other threads:[~2024-02-12 13:51 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-12 13:50 [PATCH v4 00/20] Support more Amlogic SoC families in crypto driver Alexey Romanov
2024-02-12 13:50 ` [PATCH v4 01/20] drivers: crypto: meson: don't hardcode IRQ count Alexey Romanov
2024-02-12 13:50 ` [PATCH v4 02/20] drviers: crypto: meson: add platform data Alexey Romanov
2024-02-12 17:08 ` neil.armstrong
2024-02-12 13:50 ` [PATCH v4 03/20] drivers: crypto: meson: make CLK controller optional Alexey Romanov
2024-02-12 17:10 ` neil.armstrong
2024-02-12 13:50 ` Alexey Romanov [this message]
2024-02-12 17:11 ` [PATCH v4 04/20] drivers: crypto: meson: add MMIO helpers neil.armstrong
2024-02-12 13:50 ` [PATCH v4 05/20] drivers: crypto: meson: move get_engine_number() Alexey Romanov
2024-02-12 17:11 ` neil.armstrong
2024-02-12 13:50 ` [PATCH v4 06/20] drivers: crypto: meson: drop status field from meson_flow Alexey Romanov
2024-02-12 17:12 ` neil.armstrong
2024-02-12 13:50 ` [PATCH v4 07/20] drivers: crypto: meson: move algs definition and cipher API to cipher.c Alexey Romanov
2024-02-12 17:12 ` neil.armstrong
2024-02-12 13:50 ` [PATCH v4 08/20] drivers: crypto: meson: cleanup defines Alexey Romanov
2024-02-12 17:14 ` neil.armstrong
2024-02-12 13:50 ` [PATCH v4 09/20] drivers: crypto: meson: process more than MAXDESCS descriptors Alexey Romanov
2024-02-12 13:50 ` [PATCH v4 10/20] drivers: crypto: meson: avoid kzalloc in engine thread Alexey Romanov
2024-02-12 17:15 ` neil.armstrong
2024-02-12 13:50 ` [PATCH v4 11/20] drivers: crypto: meson: introduce hasher Alexey Romanov
2024-02-12 13:51 ` [PATCH v4 12/20] drivers: crypto: meson: add support for AES-CTR Alexey Romanov
2024-02-12 13:51 ` [PATCH v4 13/20] drivers: crypto: meson: use fallback for 192-bit keys Alexey Romanov
2024-02-12 13:51 ` [PATCH v4 14/20] drivers: crypto: meson: add support for G12-series Alexey Romanov
2024-02-12 13:51 ` [PATCH v4 15/20] drivers: crypto: meson: add support for AXG-series Alexey Romanov
2024-02-12 13:51 ` [PATCH v4 16/20] dt-bindings: crypto: meson: support new SoC's Alexey Romanov
2024-02-15 14:28 ` Rob Herring
2024-02-12 13:51 ` [PATCH v4 17/20] arch: arm64: dts: meson: a1: add crypto node Alexey Romanov
2024-02-12 17:04 ` neil.armstrong
2024-02-12 13:51 ` [PATCH v4 18/20] arch: arm64: dts: meson: s4: " Alexey Romanov
2024-02-12 17:04 ` neil.armstrong
2024-02-12 13:51 ` [PATCH v4 19/20] arch: arm64: dts: meson: g12: " Alexey Romanov
2024-02-12 17:04 ` neil.armstrong
2024-02-12 13:51 ` [PATCH v4 20/20] arch: arm64: dts: meson: axg: " Alexey Romanov
2024-02-12 17:04 ` neil.armstrong
2024-02-12 17:04 ` [PATCH v4 00/20] Support more Amlogic SoC families in crypto driver neil.armstrong
2024-02-13 7:21 ` Corentin Labbe
2024-02-15 10:43 ` Alexey Romanov
2024-02-15 10:47 ` Alexey Romanov
2024-02-19 6:57 ` Corentin Labbe
2024-02-28 13:37 ` Alexey Romanov
2024-02-28 20:19 ` Corentin Labbe
2024-02-29 13:05 ` Alexey Romanov
2024-02-29 15:14 ` neil.armstrong
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=20240212135108.549755-5-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).