crypto: sun8i-ce - Use new crypto_engine_op interface

[platform/kernel/linux-starfive.git] / drivers / crypto / allwinner / sun8i-ce / sun8i-ce-hash.c

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
index 930ad15..d358334 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
@@ -9,48 +9,46 @@
  *
  * You could find the datasheet in Documentation/arch/arm/sunxi.rst
  */
+
+#include <crypto/internal/hash.h>
+#include <crypto/md5.h>
+#include <crypto/sha1.h>
+#include <crypto/sha2.h>
 #include <linux/bottom_half.h>
 #include <linux/dma-mapping.h>
+#include <linux/kernel.h>
 #include <linux/pm_runtime.h>
 #include <linux/scatterlist.h>
-#include <crypto/internal/hash.h>
-#include <crypto/sha1.h>
-#include <crypto/sha2.h>
-#include <crypto/md5.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include "sun8i-ce.h"
 
-int sun8i_ce_hash_crainit(struct crypto_tfm *tfm)
+int sun8i_ce_hash_init_tfm(struct crypto_ahash *tfm)
 {
-       struct sun8i_ce_hash_tfm_ctx *op = crypto_tfm_ctx(tfm);
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->__crt_alg);
+       struct sun8i_ce_hash_tfm_ctx *op = crypto_ahash_ctx(tfm);
+       struct ahash_alg *alg = crypto_ahash_alg(tfm);
        struct sun8i_ce_alg_template *algt;
        int err;
 
-       memset(op, 0, sizeof(struct sun8i_ce_hash_tfm_ctx));
-
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base);
        op->ce = algt->ce;
 
-       op->enginectx.op.do_one_request = sun8i_ce_hash_run;
-       op->enginectx.op.prepare_request = NULL;
-       op->enginectx.op.unprepare_request = NULL;
-
        /* FALLBACK */
-       op->fallback_tfm = crypto_alloc_ahash(crypto_tfm_alg_name(tfm), 0,
+       op->fallback_tfm = crypto_alloc_ahash(crypto_ahash_alg_name(tfm), 0,
                                              CRYPTO_ALG_NEED_FALLBACK);
        if (IS_ERR(op->fallback_tfm)) {
                dev_err(algt->ce->dev, "Fallback driver could no be loaded\n");
                return PTR_ERR(op->fallback_tfm);
        }
 
-       if (algt->alg.hash.halg.statesize < crypto_ahash_statesize(op->fallback_tfm))
-               algt->alg.hash.halg.statesize = crypto_ahash_statesize(op->fallback_tfm);
+       crypto_ahash_set_statesize(tfm,
+                                  crypto_ahash_statesize(op->fallback_tfm));
 
-       crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),
+       crypto_ahash_set_reqsize(tfm,
                                 sizeof(struct sun8i_ce_hash_reqctx) +
                                 crypto_ahash_reqsize(op->fallback_tfm));
 
-       memcpy(algt->fbname, crypto_tfm_alg_driver_name(&op->fallback_tfm->base),
+       memcpy(algt->fbname, crypto_ahash_driver_name(op->fallback_tfm),
               CRYPTO_MAX_ALG_NAME);
 
        err = pm_runtime_get_sync(op->ce->dev);
@@ -63,9 +61,9 @@ error_pm:
        return err;
 }
 
-void sun8i_ce_hash_craexit(struct crypto_tfm *tfm)
+void sun8i_ce_hash_exit_tfm(struct crypto_ahash *tfm)
 {
-       struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_tfm_ctx(tfm);
+       struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        crypto_free_ahash(tfmctx->fallback_tfm);
        pm_runtime_put_sync_suspend(tfmctx->ce->dev);
@@ -114,20 +112,22 @@ int sun8i_ce_hash_final(struct ahash_request *areq)
        struct sun8i_ce_hash_reqctx *rctx = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
-       struct sun8i_ce_alg_template *algt;
-#endif
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
        rctx->fallback_req.base.flags = areq->base.flags &
                                        CRYPTO_TFM_REQ_MAY_SLEEP;
        rctx->fallback_req.result = areq->result;
 
+       if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) {
+               struct sun8i_ce_alg_template *algt __maybe_unused;
+               struct ahash_alg *alg = crypto_ahash_alg(tfm);
+
+               algt = container_of(alg, struct sun8i_ce_alg_template,
+                                   alg.hash.base);
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
-       algt->stat_fb++;
+               algt->stat_fb++;
 #endif
+       }
 
        return crypto_ahash_final(&rctx->fallback_req);
 }
@@ -152,10 +152,6 @@ int sun8i_ce_hash_finup(struct ahash_request *areq)
        struct sun8i_ce_hash_reqctx *rctx = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
-       struct sun8i_ce_alg_template *algt;
-#endif
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
        rctx->fallback_req.base.flags = areq->base.flags &
@@ -164,10 +160,17 @@ int sun8i_ce_hash_finup(struct ahash_request *areq)
        rctx->fallback_req.nbytes = areq->nbytes;
        rctx->fallback_req.src = areq->src;
        rctx->fallback_req.result = areq->result;
+
+       if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) {
+               struct sun8i_ce_alg_template *algt __maybe_unused;
+               struct ahash_alg *alg = crypto_ahash_alg(tfm);
+
+               algt = container_of(alg, struct sun8i_ce_alg_template,
+                                   alg.hash.base);
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
-       algt->stat_fb++;
+               algt->stat_fb++;
 #endif
+       }
 
        return crypto_ahash_finup(&rctx->fallback_req);
 }
@@ -177,10 +180,6 @@ static int sun8i_ce_hash_digest_fb(struct ahash_request *areq)
        struct sun8i_ce_hash_reqctx *rctx = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun8i_ce_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
-       struct sun8i_ce_alg_template *algt;
-#endif
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
        rctx->fallback_req.base.flags = areq->base.flags &
@@ -189,10 +188,17 @@ static int sun8i_ce_hash_digest_fb(struct ahash_request *areq)
        rctx->fallback_req.nbytes = areq->nbytes;
        rctx->fallback_req.src = areq->src;
        rctx->fallback_req.result = areq->result;
+
+       if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG)) {
+               struct sun8i_ce_alg_template *algt __maybe_unused;
+               struct ahash_alg *alg = crypto_ahash_alg(tfm);
+
+               algt = container_of(alg, struct sun8i_ce_alg_template,
+                                   alg.hash.base);
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
-       algt->stat_fb++;
+               algt->stat_fb++;
 #endif
+       }
 
        return crypto_ahash_digest(&rctx->fallback_req);
 }
@@ -204,7 +210,7 @@ static bool sun8i_ce_hash_need_fallback(struct ahash_request *areq)
        struct sun8i_ce_alg_template *algt;
        struct scatterlist *sg;
 
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base);
 
        if (areq->nbytes == 0) {
                algt->stat_fb_len0++;
@@ -253,7 +259,7 @@ int sun8i_ce_hash_digest(struct ahash_request *areq)
                        return sun8i_ce_hash_digest_fb(areq);
        }
 
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base);
        ce = algt->ce;
 
        e = sun8i_ce_get_engine_number(ce);
@@ -345,11 +351,11 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
        dma_addr_t addr_res, addr_pad;
        int ns = sg_nents_for_len(areq->src, areq->nbytes);
 
-       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ce_alg_template, alg.hash.base);
        ce = algt->ce;
 
-       bs = algt->alg.hash.halg.base.cra_blocksize;
-       digestsize = algt->alg.hash.halg.digestsize;
+       bs = algt->alg.hash.base.halg.base.cra_blocksize;
+       digestsize = algt->alg.hash.base.halg.digestsize;
        if (digestsize == SHA224_DIGEST_SIZE)
                digestsize = SHA256_DIGEST_SIZE;
        if (digestsize == SHA384_DIGEST_SIZE)
@@ -454,14 +460,14 @@ int sun8i_ce_hash_run(struct crypto_engine *engine, void *breq)
 
        chan->timeout = areq->nbytes;
 
-       err = sun8i_ce_run_task(ce, flow, crypto_tfm_alg_name(areq->base.tfm));
+       err = sun8i_ce_run_task(ce, flow, crypto_ahash_alg_name(tfm));
 
        dma_unmap_single(ce->dev, addr_pad, j * 4, DMA_TO_DEVICE);
        dma_unmap_sg(ce->dev, areq->src, ns, DMA_TO_DEVICE);
        dma_unmap_single(ce->dev, addr_res, digestsize, DMA_FROM_DEVICE);
 
 
-       memcpy(areq->result, result, algt->alg.hash.halg.digestsize);
+       memcpy(areq->result, result, algt->alg.hash.base.halg.digestsize);
 theend:
        kfree(buf);
        kfree(result);