Commit fb45490d authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu

crypto: stm32-hash - convert to the new crypto engine API

This patch convert the stm32-hash driver to the new crypto engine API.
Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Tested-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 67189375
...@@ -122,6 +122,7 @@ enum stm32_hash_data_format { ...@@ -122,6 +122,7 @@ enum stm32_hash_data_format {
#define HASH_DMA_THRESHOLD 50 #define HASH_DMA_THRESHOLD 50
struct stm32_hash_ctx { struct stm32_hash_ctx {
struct crypto_engine_ctx enginectx;
struct stm32_hash_dev *hdev; struct stm32_hash_dev *hdev;
unsigned long flags; unsigned long flags;
...@@ -828,15 +829,19 @@ static int stm32_hash_hw_init(struct stm32_hash_dev *hdev, ...@@ -828,15 +829,19 @@ static int stm32_hash_hw_init(struct stm32_hash_dev *hdev,
return 0; return 0;
} }
static int stm32_hash_one_request(struct crypto_engine *engine, void *areq);
static int stm32_hash_prepare_req(struct crypto_engine *engine, void *areq);
static int stm32_hash_handle_queue(struct stm32_hash_dev *hdev, static int stm32_hash_handle_queue(struct stm32_hash_dev *hdev,
struct ahash_request *req) struct ahash_request *req)
{ {
return crypto_transfer_hash_request_to_engine(hdev->engine, req); return crypto_transfer_hash_request_to_engine(hdev->engine, req);
} }
static int stm32_hash_prepare_req(struct crypto_engine *engine, static int stm32_hash_prepare_req(struct crypto_engine *engine, void *areq)
struct ahash_request *req)
{ {
struct ahash_request *req = container_of(areq, struct ahash_request,
base);
struct stm32_hash_ctx *ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req)); 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_dev *hdev = stm32_hash_find_dev(ctx);
struct stm32_hash_request_ctx *rctx; struct stm32_hash_request_ctx *rctx;
...@@ -854,9 +859,10 @@ static int stm32_hash_prepare_req(struct crypto_engine *engine, ...@@ -854,9 +859,10 @@ static int stm32_hash_prepare_req(struct crypto_engine *engine,
return stm32_hash_hw_init(hdev, rctx); return stm32_hash_hw_init(hdev, rctx);
} }
static int stm32_hash_one_request(struct crypto_engine *engine, static int stm32_hash_one_request(struct crypto_engine *engine, void *areq)
struct ahash_request *req)
{ {
struct ahash_request *req = container_of(areq, struct ahash_request,
base);
struct stm32_hash_ctx *ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(req)); 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_dev *hdev = stm32_hash_find_dev(ctx);
struct stm32_hash_request_ctx *rctx; struct stm32_hash_request_ctx *rctx;
...@@ -1033,6 +1039,9 @@ static int stm32_hash_cra_init_algs(struct crypto_tfm *tfm, ...@@ -1033,6 +1039,9 @@ static int stm32_hash_cra_init_algs(struct crypto_tfm *tfm,
if (algs_hmac_name) if (algs_hmac_name)
ctx->flags |= HASH_FLAGS_HMAC; 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; return 0;
} }
...@@ -1493,9 +1502,6 @@ static int stm32_hash_probe(struct platform_device *pdev) ...@@ -1493,9 +1502,6 @@ static int stm32_hash_probe(struct platform_device *pdev)
goto err_engine; 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); ret = crypto_engine_start(hdev->engine);
if (ret) if (ret)
goto err_engine_start; goto err_engine_start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment