From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, ardb@kernel.org, davem@davemloft.net,
herbert@gondor.apana.org.au, krzysztof.kozlowski+dt@linaro.org,
mturquette@baylibre.com, robh+dt@kernel.org, sboyd@kernel.org
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-clk@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
Corentin Labbe <clabbe@baylibre.com>,
John Keeping <john@metanate.com>
Subject: [PATCH v10 22/33] crypto: rockchip: use a rk_crypto_info variable instead of lot of indirection
Date: Tue, 27 Sep 2022 07:55:00 +0000 [thread overview]
Message-ID: <20220927075511.3147847-23-clabbe@baylibre.com> (raw)
In-Reply-To: <20220927075511.3147847-1-clabbe@baylibre.com>
Instead of using lot of ctx->dev->xx indirections, use an intermediate
variable for rk_crypto_info.
This will help later, when 2 different rk_crypto_info would be used.
Reviewed-by: John Keeping <john@metanate.com>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
drivers/crypto/rockchip/rk3288_crypto_ahash.c | 23 +++++++-----
.../crypto/rockchip/rk3288_crypto_skcipher.c | 37 ++++++++++---------
2 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
index fae779d73c84..636dbcde0ca3 100644
--- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
@@ -226,9 +226,10 @@ static int rk_hash_prepare(struct crypto_engine *engine, void *breq)
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct rk_ahash_rctx *rctx = ahash_request_ctx(areq);
struct rk_ahash_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct rk_crypto_info *rkc = tctx->dev;
int ret;
- ret = dma_map_sg(tctx->dev->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE);
+ ret = dma_map_sg(rkc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE);
if (ret <= 0)
return -EINVAL;
@@ -243,8 +244,9 @@ static int rk_hash_unprepare(struct crypto_engine *engine, void *breq)
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct rk_ahash_rctx *rctx = ahash_request_ctx(areq);
struct rk_ahash_ctx *tctx = crypto_ahash_ctx(tfm);
+ struct rk_crypto_info *rkc = tctx->dev;
- dma_unmap_sg(tctx->dev->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE);
+ dma_unmap_sg(rkc->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE);
return 0;
}
@@ -257,6 +259,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
struct rk_crypto_tmp *algt = container_of(alg, struct rk_crypto_tmp, alg.hash);
struct scatterlist *sg = areq->src;
+ struct rk_crypto_info *rkc = tctx->dev;
int err = 0;
int i;
u32 v;
@@ -283,13 +286,13 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
rk_ahash_reg_init(areq);
while (sg) {
- reinit_completion(&tctx->dev->complete);
- tctx->dev->status = 0;
- crypto_ahash_dma_start(tctx->dev, sg);
- wait_for_completion_interruptible_timeout(&tctx->dev->complete,
+ reinit_completion(&rkc->complete);
+ rkc->status = 0;
+ crypto_ahash_dma_start(rkc, sg);
+ wait_for_completion_interruptible_timeout(&rkc->complete,
msecs_to_jiffies(2000));
- if (!tctx->dev->status) {
- dev_err(tctx->dev->dev, "DMA timeout\n");
+ if (!rkc->status) {
+ dev_err(rkc->dev, "DMA timeout\n");
err = -EFAULT;
goto theend;
}
@@ -306,10 +309,10 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
* efficiency, and make it response quickly when dma
* complete.
*/
- readl_poll_timeout(tctx->dev->reg + RK_CRYPTO_HASH_STS, v, v == 0, 10, 1000);
+ readl_poll_timeout(rkc->reg + RK_CRYPTO_HASH_STS, v, v == 0, 10, 1000);
for (i = 0; i < crypto_ahash_digestsize(tfm) / 4; i++) {
- v = readl(tctx->dev->reg + RK_CRYPTO_HASH_DOUT_0 + i * 4);
+ v = readl(rkc->reg + RK_CRYPTO_HASH_DOUT_0 + i * 4);
put_unaligned_le32(v, areq->result + i * 4);
}
diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
index 3187869c4c68..6a1bea98fded 100644
--- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
@@ -303,6 +303,7 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req)
unsigned int todo;
struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
struct rk_crypto_tmp *algt = container_of(alg, struct rk_crypto_tmp, alg.skcipher);
+ struct rk_crypto_info *rkc = ctx->dev;
algt->stat_req++;
@@ -330,49 +331,49 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req)
scatterwalk_map_and_copy(biv, sgs, offset, ivsize, 0);
}
if (sgs == sgd) {
- err = dma_map_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL);
+ err = dma_map_sg(rkc->dev, sgs, 1, DMA_BIDIRECTIONAL);
if (err <= 0) {
err = -EINVAL;
goto theend_iv;
}
} else {
- err = dma_map_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE);
+ err = dma_map_sg(rkc->dev, sgs, 1, DMA_TO_DEVICE);
if (err <= 0) {
err = -EINVAL;
goto theend_iv;
}
- err = dma_map_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE);
+ err = dma_map_sg(rkc->dev, sgd, 1, DMA_FROM_DEVICE);
if (err <= 0) {
err = -EINVAL;
goto theend_sgs;
}
}
err = 0;
- rk_cipher_hw_init(ctx->dev, areq);
+ rk_cipher_hw_init(rkc, areq);
if (ivsize) {
if (ivsize == DES_BLOCK_SIZE)
- memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize);
+ memcpy_toio(rkc->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize);
else
- memcpy_toio(ctx->dev->reg + RK_CRYPTO_AES_IV_0, ivtouse, ivsize);
+ memcpy_toio(rkc->reg + RK_CRYPTO_AES_IV_0, ivtouse, ivsize);
}
- reinit_completion(&ctx->dev->complete);
- ctx->dev->status = 0;
+ reinit_completion(&rkc->complete);
+ rkc->status = 0;
todo = min(sg_dma_len(sgs), len);
len -= todo;
- crypto_dma_start(ctx->dev, sgs, sgd, todo / 4);
- wait_for_completion_interruptible_timeout(&ctx->dev->complete,
+ crypto_dma_start(rkc, sgs, sgd, todo / 4);
+ wait_for_completion_interruptible_timeout(&rkc->complete,
msecs_to_jiffies(2000));
- if (!ctx->dev->status) {
- dev_err(ctx->dev->dev, "DMA timeout\n");
+ if (!rkc->status) {
+ dev_err(rkc->dev, "DMA timeout\n");
err = -EFAULT;
goto theend;
}
if (sgs == sgd) {
- dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL);
+ dma_unmap_sg(rkc->dev, sgs, 1, DMA_BIDIRECTIONAL);
} else {
- dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE);
- dma_unmap_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE);
+ dma_unmap_sg(rkc->dev, sgs, 1, DMA_TO_DEVICE);
+ dma_unmap_sg(rkc->dev, sgd, 1, DMA_FROM_DEVICE);
}
if (rctx->mode & RK_CRYPTO_DEC) {
memcpy(iv, biv, ivsize);
@@ -405,10 +406,10 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req)
theend_sgs:
if (sgs == sgd) {
- dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_BIDIRECTIONAL);
+ dma_unmap_sg(rkc->dev, sgs, 1, DMA_BIDIRECTIONAL);
} else {
- dma_unmap_sg(ctx->dev->dev, sgs, 1, DMA_TO_DEVICE);
- dma_unmap_sg(ctx->dev->dev, sgd, 1, DMA_FROM_DEVICE);
+ dma_unmap_sg(rkc->dev, sgs, 1, DMA_TO_DEVICE);
+ dma_unmap_sg(rkc->dev, sgd, 1, DMA_FROM_DEVICE);
}
theend_iv:
return err;
--
2.35.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-09-27 9:05 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 7:54 [PATCH v10 00/33] crypto: rockchip: permit to pass self-tests Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 01/33] crypto: rockchip: use dev_err for error message about interrupt Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 02/33] crypto: rockchip: do not use uninitialized variable Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 03/33] crypto: rockchip: do not do custom power management Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 04/33] crypto: rockchip: fix privete/private typo Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 05/33] crypto: rockchip: do not store mode globally Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 06/33] crypto: rockchip: add fallback for cipher Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 07/33] crypto: rockchip: add fallback for ahash Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 08/33] crypto: rockchip: better handle cipher key Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 09/33] crypto: rockchip: remove non-aligned handling Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 10/33] crypto: rockchip: rework by using crypto_engine Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 11/33] crypto: rockchip: rewrite type Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 12/33] crypto: rockchip: add debugfs Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 13/33] crypto: rockchip: introduce PM Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 14/33] crypto: rockchip: handle reset also in PM Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 15/33] crypto: rockchip: use clk_bulk to simplify clock management Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 16/33] crypto: rockchip: add myself as maintainer Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 17/33] crypto: rockchip: use read_poll_timeout Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 18/33] crypto: rockchip: fix style issue Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 19/33] crypto: rockchip: add support for rk3328 Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 20/33] crypto: rockchip: rename ablk functions to cipher Corentin Labbe
2022-09-27 7:54 ` [PATCH v10 21/33] crypto: rockchip: rework rk_handle_req function Corentin Labbe
2022-09-27 7:55 ` Corentin Labbe [this message]
2022-09-27 7:55 ` [PATCH v10 23/33] crypto: rockchip: use the rk_crypto_info given as parameter Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 24/33] dt-bindings: crypto: convert rockchip-crypto to YAML Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 25/33] dt-bindings: crypto: rockchip: add new compatible Corentin Labbe
2022-09-29 22:14 ` Rob Herring
2022-09-27 7:55 ` [PATCH v10 26/33] clk: rk3399: use proper crypto0 name Corentin Labbe
2022-09-28 18:58 ` Stephen Boyd
2022-09-27 7:55 ` [PATCH v10 27/33] arm64: dts: rockchip: add rk3328 crypto node Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 28/33] arm64: dts: rockchip: rk3399: add " Corentin Labbe
2022-12-11 15:51 ` Rob Herring
2022-12-12 12:44 ` Corentin LABBE
2022-09-27 7:55 ` [PATCH v10 29/33] crypto: rockchip: store crypto_info in request context Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 30/33] crypto: rockchip: Check for clocks numbers and their frequencies Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 31/33] crypto: rockchip: rk_ahash_reg_init use crypto_info from parameter Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 32/33] crypto: rockchip: permit to have more than one reset Corentin Labbe
2022-09-27 7:55 ` [PATCH v10 33/33] crypto: rockchip: Add support for RK3399 Corentin Labbe
2022-10-21 13:20 ` [PATCH v10 00/33] crypto: rockchip: permit to pass self-tests Corentin LABBE
2022-10-21 17:09 ` Heiko Stübner
2022-10-26 7:41 ` Corentin LABBE
2022-10-26 10:05 ` Herbert Xu
2022-10-26 10:25 ` Heiko Stübner
2022-10-28 2:06 ` Krzysztof Kozlowski
2022-10-28 5:01 ` Herbert Xu
2022-10-29 8:12 ` (subset) " Heiko Stuebner
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=20220927075511.3147847-23-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=ardb@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=john@metanate.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
/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).