From: Corentin Labbe <clabbe@baylibre.com>
To: heiko@sntech.de, herbert@gondor.apana.org.au,
krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-crypto@vger.kernel.org, linux-rockchip@lists.infradead.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH v5 29/33] crypto: rockchip: store crypto_info in request context
Date: Wed, 13 Apr 2022 19:07:09 +0000 [thread overview]
Message-ID: <20220413190713.1427956-30-clabbe@baylibre.com> (raw)
In-Reply-To: <20220413190713.1427956-1-clabbe@baylibre.com>
The crypto_info to use must be stored in the request context.
This will help when 2 crypto_info will be available on rk3399.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
drivers/crypto/rockchip/rk3288_crypto.h | 2 ++
drivers/crypto/rockchip/rk3288_crypto_ahash.c | 14 ++++++--------
drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 6 ++++--
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
index 28bf09fe1c1d..ff9fc25972eb 100644
--- a/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/drivers/crypto/rockchip/rk3288_crypto.h
@@ -215,6 +215,7 @@ struct rk_ahash_ctx {
/* the private variable of hash for fallback */
struct rk_ahash_rctx {
+ struct rk_crypto_info *dev;
struct ahash_request fallback_req;
u32 mode;
int nrsg;
@@ -231,6 +232,7 @@ struct rk_cipher_ctx {
};
struct rk_cipher_rctx {
+ struct rk_crypto_info *dev;
u8 backup_iv[AES_BLOCK_SIZE];
u32 mode;
struct skcipher_request fallback_req; // keep at the end
diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
index 636dbcde0ca3..d1bf68cb390d 100644
--- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
@@ -200,6 +200,7 @@ static int rk_ahash_export(struct ahash_request *req, void *out)
static int rk_ahash_digest(struct ahash_request *req)
{
+ struct rk_ahash_rctx *rctx = ahash_request_ctx(req);
struct rk_ahash_ctx *tctx = crypto_tfm_ctx(req->base.tfm);
struct rk_crypto_info *dev = tctx->dev;
@@ -209,6 +210,8 @@ static int rk_ahash_digest(struct ahash_request *req)
if (!req->nbytes)
return zero_message_process(req);
+ rctx->dev = dev;
+
return crypto_transfer_hash_request_to_engine(dev->engine, req);
}
@@ -223,10 +226,8 @@ static void crypto_ahash_dma_start(struct rk_crypto_info *dev, struct scatterlis
static int rk_hash_prepare(struct crypto_engine *engine, void *breq)
{
struct ahash_request *areq = container_of(breq, struct ahash_request, base);
- 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;
+ struct rk_crypto_info *rkc = rctx->dev;
int ret;
ret = dma_map_sg(rkc->dev, areq->src, sg_nents(areq->src), DMA_TO_DEVICE);
@@ -241,10 +242,8 @@ static int rk_hash_prepare(struct crypto_engine *engine, void *breq)
static int rk_hash_unprepare(struct crypto_engine *engine, void *breq)
{
struct ahash_request *areq = container_of(breq, struct ahash_request, base);
- 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;
+ struct rk_crypto_info *rkc = rctx->dev;
dma_unmap_sg(rkc->dev, areq->src, rctx->nrsg, DMA_TO_DEVICE);
return 0;
@@ -255,11 +254,10 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
struct ahash_request *areq = container_of(breq, struct ahash_request, base);
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 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;
+ struct rk_crypto_info *rkc = rctx->dev;
int err = 0;
int i;
u32 v;
diff --git a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
index cf0dfb6029d8..0b1c90ababb7 100644
--- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
@@ -86,12 +86,15 @@ static int rk_cipher_handle_req(struct skcipher_request *req)
{
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct rk_cipher_ctx *tctx = crypto_skcipher_ctx(tfm);
+ struct rk_cipher_rctx *rctx = skcipher_request_ctx(req);
struct rk_crypto_info *rkc = tctx->dev;
struct crypto_engine *engine = rkc->engine;
if (rk_cipher_need_fallback(req))
return rk_cipher_fallback(req);
+ rctx->dev = rkc;
+
return crypto_transfer_skcipher_request_to_engine(engine, req);
}
@@ -290,7 +293,6 @@ static int rk_cipher_run(struct crypto_engine *engine, void *async_req)
{
struct skcipher_request *areq = container_of(async_req, struct skcipher_request, base);
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
- struct rk_cipher_ctx *ctx = crypto_skcipher_ctx(tfm);
struct rk_cipher_rctx *rctx = skcipher_request_ctx(areq);
struct scatterlist *sgs, *sgd;
int err = 0;
@@ -303,7 +305,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;
+ struct rk_crypto_info *rkc = rctx->dev;
algt->stat_req++;
--
2.35.1
next prev parent reply other threads:[~2022-04-13 19:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 19:06 [PATCH v5 00/33] crypto: rockchip: permit to pass self-tests Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 01/33] crypto: rockchip: use dev_err for error message about interrupt Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 02/33] crypto: rockchip: do not use uninitialized variable Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 03/33] crypto: rockchip: do not do custom power management Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 04/33] crypto: rockchip: fix privete/private typo Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 05/33] crypto: rockchip: do not store mode globally Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 06/33] crypto: rockchip: add fallback for cipher Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 07/33] crypto: rockchip: add fallback for ahash Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 08/33] crypto: rockchip: better handle cipher key Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 09/33] crypto: rockchip: remove non-aligned handling Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 10/33] crypto: rockchip: rework by using crypto_engine Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 11/33] crypto: rockchip: rewrite type Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 12/33] crypto: rockchip: add debugfs Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 13/33] crypto: rockchip: introduce PM Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 14/33] crypto: rockchip: handle reset also in PM Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 15/33] crypto: rockchip: use clk_bulk to simplify clock management Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 16/33] crypto: rockchip: add myself as maintainer Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 17/33] crypto: rockchip: use read_poll_timeout Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 18/33] crypto: rockchip: fix style issue Corentin Labbe
2022-04-13 19:06 ` [PATCH v5 19/33] crypto: rockchip: add support for rk3328 Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 20/33] crypto: rockchip: rename ablk functions to cipher Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 21/33] crypto: rockchip: rework rk_handle_req function Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 22/33] crypto: rockchip: use a rk_crypto_info variable instead of lot of indirection Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 23/33] crypto: rockchip: use the rk_crypto_info given as parameter Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 24/33] dt-bindings: crypto: convert rockchip-crypto to YAML Corentin Labbe
2022-04-13 19:31 ` Krzysztof Kozlowski
2022-04-19 11:09 ` LABBE Corentin
2022-04-19 11:54 ` Krzysztof Kozlowski
2022-04-14 13:28 ` Rob Herring
2022-04-13 19:07 ` [PATCH v5 25/33] dt-bindings: crypto: rockchip: convert to new driver bindings Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 26/33] clk: rk3399: use proper crypto0 name Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 27/33] arm64: dts: rockchip: add rk3328 crypto node Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 28/33] arm64: dts: rockchip: rk3399: add " Corentin Labbe
2022-04-13 19:07 ` Corentin Labbe [this message]
2022-04-13 19:07 ` [PATCH v5 30/33] crypto: rockchip: Check for clocks numbers and their frequencies Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 31/33] crypto: rockchip: rk_ahash_reg_init use crypto_info from parameter Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 32/33] crypto: rockchip: permit to have more than one reset Corentin Labbe
2022-04-13 19:07 ` [PATCH v5 33/33] crypto: rockchip: Add support for RK3399 Corentin Labbe
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=20220413190713.1427956-30-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robh+dt@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).