Thread (16 messages) 16 messages, 3 authors, 2018-01-12

[PATCH 5/6] crypto: stm32-hash: convert to the new crypto engine API

From: Fabien DESSENNE <hidden>
Date: 2018-01-10 14:25:10
Also in: linux-crypto, lkml


On 03/01/18 21:11, Corentin Labbe wrote:
quoted hunk ↗ jump to hunk
This patch convert the stm32-hash driver to the new crypto engine API.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
  drivers/crypto/stm32/stm32-hash.c | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/stm32/stm32-hash.c b/drivers/crypto/stm32/stm32-hash.c
index 4ca4a264a833..9790c2c936c7 100644
--- a/drivers/crypto/stm32/stm32-hash.c
+++ b/drivers/crypto/stm32/stm32-hash.c
@@ -122,6 +122,7 @@ enum stm32_hash_data_format {
  #define HASH_DMA_THRESHOLD		50
  
  struct stm32_hash_ctx {
+	struct crypto_engine_reqctx enginectx;
  	struct stm32_hash_dev	*hdev;
  	unsigned long		flags;
  
@@ -828,6 +829,11 @@ static int stm32_hash_hw_init(struct stm32_hash_dev *hdev,
  	return 0;
  }
  
+static int stm32_hash_one_request(struct crypto_engine *engine,
+				  void *areq);
merge these two lines in a single one
+static int stm32_hash_prepare_req(struct crypto_engine *engine,
+				  void *areq);
merge these two lines in a single one
quoted hunk ↗ jump to hunk
+
  static int stm32_hash_handle_queue(struct stm32_hash_dev *hdev,
  				   struct ahash_request *req)
  {
@@ -835,8 +841,9 @@ static int stm32_hash_handle_queue(struct stm32_hash_dev *hdev,
  }
  
  static int stm32_hash_prepare_req(struct crypto_engine *engine,
-				  struct ahash_request *req)
+				  void *areq)
merge these two lines in a single one
  {
+	struct ahash_request *req = container_of(areq, struct ahash_request, base);
 > 80 characters (CHECKPATCH)
quoted hunk ↗ jump to hunk
  	struct stm32_hash_ctx *ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));
  	struct stm32_hash_dev *hdev = stm32_hash_find_dev(ctx);
  	struct stm32_hash_request_ctx *rctx;
@@ -855,8 +862,9 @@ static int stm32_hash_prepare_req(struct crypto_engine *engine,
  }
  
  static int stm32_hash_one_request(struct crypto_engine *engine,
-				  struct ahash_request *req)
+				  void *areq)
merge these two lines in a single one
  {
+	struct ahash_request *req = container_of(areq, struct ahash_request, base);
 > 80 characters (CHECKPATCH)
quoted hunk ↗ jump to hunk
  	struct stm32_hash_ctx *ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req));
  	struct stm32_hash_dev *hdev = stm32_hash_find_dev(ctx);
  	struct stm32_hash_request_ctx *rctx;
@@ -1033,6 +1041,9 @@ static int stm32_hash_cra_init_algs(struct crypto_tfm *tfm,
  	if (algs_hmac_name)
  		ctx->flags |= HASH_FLAGS_HMAC;
  
+	ctx->enginectx.op.do_one_request = stm32_hash_one_request;
+	ctx->enginectx.op.prepare_request = stm32_hash_prepare_req;
+	ctx->enginectx.op.unprepare_request = NULL;
  	return 0;
  }
  
@@ -1493,9 +1504,6 @@ static int stm32_hash_probe(struct platform_device *pdev)
  		goto err_engine;
  	}
  
-	hdev->engine->prepare_hash_request = stm32_hash_prepare_req;
-	hdev->engine->hash_one_request = stm32_hash_one_request;
-
  	ret = crypto_engine_start(hdev->engine);
  	if (ret)
  		goto err_engine_start;
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help