crypto: sun8i-ss - Use new crypto_engine_op interface

Use the new crypto_engine_op interface where the callback is stored
in the algorithm object.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
index 2758dad..7fa3597 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
@@ -24,7 +24,7 @@ static bool sun8i_ss_need_fallback(struct skcipher_request *areq)
 {
        struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
        struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
-       struct sun8i_ss_alg_template *algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher);
+       struct sun8i_ss_alg_template *algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher.base);
        struct scatterlist *in_sg = areq->src;
        struct scatterlist *out_sg = areq->dst;
        struct scatterlist *sg;
@@ -93,13 +93,18 @@ static int sun8i_ss_cipher_fallback(struct skcipher_request *areq)
        struct sun8i_cipher_req_ctx *rctx = skcipher_request_ctx(areq);
        int err;
 
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
-       struct sun8i_ss_alg_template *algt;
+       if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG)) {
+               struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
+               struct sun8i_ss_alg_template *algt __maybe_unused;
+
+               algt = container_of(alg, struct sun8i_ss_alg_template,
+                                   alg.skcipher.base);
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher);
-       algt->stat_fb++;
+#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
+               algt->stat_fb++;
 #endif
+       }
+
        skcipher_request_set_tfm(&rctx->fallback_req, op->fallback_tfm);
        skcipher_request_set_callback(&rctx->fallback_req, areq->base.flags,
                                      areq->base.complete, areq->base.data);
@@ -193,7 +198,7 @@ static int sun8i_ss_cipher(struct skcipher_request *areq)
        int nsgd = sg_nents_for_len(areq->dst, areq->cryptlen);
        int i;
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher);
+       algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher.base);
 
        dev_dbg(ss->dev, "%s %s %u %x IV(%p %u) key=%u\n", __func__,
                crypto_tfm_alg_name(areq->base.tfm),
@@ -324,7 +329,7 @@ theend:
        return err;
 }
 
-static int sun8i_ss_handle_cipher_request(struct crypto_engine *engine, void *areq)
+int sun8i_ss_handle_cipher_request(struct crypto_engine *engine, void *areq)
 {
        int err;
        struct skcipher_request *breq = container_of(areq, struct skcipher_request, base);
@@ -390,7 +395,7 @@ int sun8i_ss_cipher_init(struct crypto_tfm *tfm)
 
        memset(op, 0, sizeof(struct sun8i_cipher_tfm_ctx));
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher);
+       algt = container_of(alg, struct sun8i_ss_alg_template, alg.skcipher.base);
        op->ss = algt->ss;
 
        op->fallback_tfm = crypto_alloc_skcipher(name, 0, CRYPTO_ALG_NEED_FALLBACK);
@@ -408,8 +413,6 @@ int sun8i_ss_cipher_init(struct crypto_tfm *tfm)
               crypto_tfm_alg_driver_name(crypto_skcipher_tfm(op->fallback_tfm)),
               CRYPTO_MAX_ALG_NAME);
 
-       op->enginectx.op.do_one_request = sun8i_ss_handle_cipher_request;
-
        err = pm_runtime_resume_and_get(op->ss->dev);
        if (err < 0) {
                dev_err(op->ss->dev, "pm error %d\n", err);

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
index 3dd844b..62c001c 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
@@ -9,10 +9,14 @@
  *
  * You could find a link for the datasheet in Documentation/arch/arm/sunxi.rst
  */
+
+#include <crypto/engine.h>
+#include <crypto/internal/rng.h>
+#include <crypto/internal/skcipher.h>
 #include <linux/clk.h>
-#include <linux/crypto.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
@@ -23,8 +27,6 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
-#include <crypto/internal/rng.h>
-#include <crypto/internal/skcipher.h>
 
 #include "sun8i-ss.h"
 
@@ -168,7 +170,7 @@ static struct sun8i_ss_alg_template ss_algs[] = {
        .type = CRYPTO_ALG_TYPE_SKCIPHER,
        .ss_algo_id = SS_ID_CIPHER_AES,
        .ss_blockmode = SS_ID_OP_CBC,
-       .alg.skcipher = {
+       .alg.skcipher.base = {
                .base = {
                        .cra_name = "cbc(aes)",
                        .cra_driver_name = "cbc-aes-sun8i-ss",
@@ -189,13 +191,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .setkey         = sun8i_ss_aes_setkey,
                .encrypt        = sun8i_ss_skencrypt,
                .decrypt        = sun8i_ss_skdecrypt,
-       }
+       },
+       .alg.skcipher.op = {
+               .do_one_request = sun8i_ss_handle_cipher_request,
+       },
 },
 {
        .type = CRYPTO_ALG_TYPE_SKCIPHER,
        .ss_algo_id = SS_ID_CIPHER_AES,
        .ss_blockmode = SS_ID_OP_ECB,
-       .alg.skcipher = {
+       .alg.skcipher.base = {
                .base = {
                        .cra_name = "ecb(aes)",
                        .cra_driver_name = "ecb-aes-sun8i-ss",
@@ -215,13 +220,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .setkey         = sun8i_ss_aes_setkey,
                .encrypt        = sun8i_ss_skencrypt,
                .decrypt        = sun8i_ss_skdecrypt,
-       }
+       },
+       .alg.skcipher.op = {
+               .do_one_request = sun8i_ss_handle_cipher_request,
+       },
 },
 {
        .type = CRYPTO_ALG_TYPE_SKCIPHER,
        .ss_algo_id = SS_ID_CIPHER_DES3,
        .ss_blockmode = SS_ID_OP_CBC,
-       .alg.skcipher = {
+       .alg.skcipher.base = {
                .base = {
                        .cra_name = "cbc(des3_ede)",
                        .cra_driver_name = "cbc-des3-sun8i-ss",
@@ -242,13 +250,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .setkey         = sun8i_ss_des3_setkey,
                .encrypt        = sun8i_ss_skencrypt,
                .decrypt        = sun8i_ss_skdecrypt,
-       }
+       },
+       .alg.skcipher.op = {
+               .do_one_request = sun8i_ss_handle_cipher_request,
+       },
 },
 {
        .type = CRYPTO_ALG_TYPE_SKCIPHER,
        .ss_algo_id = SS_ID_CIPHER_DES3,
        .ss_blockmode = SS_ID_OP_ECB,
-       .alg.skcipher = {
+       .alg.skcipher.base = {
                .base = {
                        .cra_name = "ecb(des3_ede)",
                        .cra_driver_name = "ecb-des3-sun8i-ss",
@@ -268,7 +279,10 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .setkey         = sun8i_ss_des3_setkey,
                .encrypt        = sun8i_ss_skencrypt,
                .decrypt        = sun8i_ss_skdecrypt,
-       }
+       },
+       .alg.skcipher.op = {
+               .do_one_request = sun8i_ss_handle_cipher_request,
+       },
 },
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG
 {
@@ -292,7 +306,7 @@ static struct sun8i_ss_alg_template ss_algs[] = {
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_HASH
 {      .type = CRYPTO_ALG_TYPE_AHASH,
        .ss_algo_id = SS_ID_HASH_MD5,
-       .alg.hash = {
+       .alg.hash.base = {
                .init = sun8i_ss_hash_init,
                .update = sun8i_ss_hash_update,
                .final = sun8i_ss_hash_final,
@@ -300,6 +314,8 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .digest = sun8i_ss_hash_digest,
                .export = sun8i_ss_hash_export,
                .import = sun8i_ss_hash_import,
+               .init_tfm = sun8i_ss_hash_init_tfm,
+               .exit_tfm = sun8i_ss_hash_exit_tfm,
                .halg = {
                        .digestsize = MD5_DIGEST_SIZE,
                        .statesize = sizeof(struct md5_state),
@@ -314,15 +330,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                                .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct sun8i_ss_hash_tfm_ctx),
                                .cra_module = THIS_MODULE,
-                               .cra_init = sun8i_ss_hash_crainit,
-                               .cra_exit = sun8i_ss_hash_craexit,
                        }
                }
-       }
+       },
+       .alg.hash.op = {
+               .do_one_request = sun8i_ss_hash_run,
+       },
 },
 {      .type = CRYPTO_ALG_TYPE_AHASH,
        .ss_algo_id = SS_ID_HASH_SHA1,
-       .alg.hash = {
+       .alg.hash.base = {
                .init = sun8i_ss_hash_init,
                .update = sun8i_ss_hash_update,
                .final = sun8i_ss_hash_final,
@@ -330,6 +347,8 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .digest = sun8i_ss_hash_digest,
                .export = sun8i_ss_hash_export,
                .import = sun8i_ss_hash_import,
+               .init_tfm = sun8i_ss_hash_init_tfm,
+               .exit_tfm = sun8i_ss_hash_exit_tfm,
                .halg = {
                        .digestsize = SHA1_DIGEST_SIZE,
                        .statesize = sizeof(struct sha1_state),
@@ -344,15 +363,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                                .cra_blocksize = SHA1_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct sun8i_ss_hash_tfm_ctx),
                                .cra_module = THIS_MODULE,
-                               .cra_init = sun8i_ss_hash_crainit,
-                               .cra_exit = sun8i_ss_hash_craexit,
                        }
                }
-       }
+       },
+       .alg.hash.op = {
+               .do_one_request = sun8i_ss_hash_run,
+       },
 },
 {      .type = CRYPTO_ALG_TYPE_AHASH,
        .ss_algo_id = SS_ID_HASH_SHA224,
-       .alg.hash = {
+       .alg.hash.base = {
                .init = sun8i_ss_hash_init,
                .update = sun8i_ss_hash_update,
                .final = sun8i_ss_hash_final,
@@ -360,6 +380,8 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .digest = sun8i_ss_hash_digest,
                .export = sun8i_ss_hash_export,
                .import = sun8i_ss_hash_import,
+               .init_tfm = sun8i_ss_hash_init_tfm,
+               .exit_tfm = sun8i_ss_hash_exit_tfm,
                .halg = {
                        .digestsize = SHA224_DIGEST_SIZE,
                        .statesize = sizeof(struct sha256_state),
@@ -374,15 +396,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                                .cra_blocksize = SHA224_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct sun8i_ss_hash_tfm_ctx),
                                .cra_module = THIS_MODULE,
-                               .cra_init = sun8i_ss_hash_crainit,
-                               .cra_exit = sun8i_ss_hash_craexit,
                        }
                }
-       }
+       },
+       .alg.hash.op = {
+               .do_one_request = sun8i_ss_hash_run,
+       },
 },
 {      .type = CRYPTO_ALG_TYPE_AHASH,
        .ss_algo_id = SS_ID_HASH_SHA256,
-       .alg.hash = {
+       .alg.hash.base = {
                .init = sun8i_ss_hash_init,
                .update = sun8i_ss_hash_update,
                .final = sun8i_ss_hash_final,
@@ -390,6 +413,8 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .digest = sun8i_ss_hash_digest,
                .export = sun8i_ss_hash_export,
                .import = sun8i_ss_hash_import,
+               .init_tfm = sun8i_ss_hash_init_tfm,
+               .exit_tfm = sun8i_ss_hash_exit_tfm,
                .halg = {
                        .digestsize = SHA256_DIGEST_SIZE,
                        .statesize = sizeof(struct sha256_state),
@@ -404,15 +429,16 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                                .cra_blocksize = SHA256_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct sun8i_ss_hash_tfm_ctx),
                                .cra_module = THIS_MODULE,
-                               .cra_init = sun8i_ss_hash_crainit,
-                               .cra_exit = sun8i_ss_hash_craexit,
                        }
                }
-       }
+       },
+       .alg.hash.op = {
+               .do_one_request = sun8i_ss_hash_run,
+       },
 },
 {      .type = CRYPTO_ALG_TYPE_AHASH,
        .ss_algo_id = SS_ID_HASH_SHA1,
-       .alg.hash = {
+       .alg.hash.base = {
                .init = sun8i_ss_hash_init,
                .update = sun8i_ss_hash_update,
                .final = sun8i_ss_hash_final,
@@ -420,6 +446,8 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                .digest = sun8i_ss_hash_digest,
                .export = sun8i_ss_hash_export,
                .import = sun8i_ss_hash_import,
+               .init_tfm = sun8i_ss_hash_init_tfm,
+               .exit_tfm = sun8i_ss_hash_exit_tfm,
                .setkey = sun8i_ss_hmac_setkey,
                .halg = {
                        .digestsize = SHA1_DIGEST_SIZE,
@@ -435,23 +463,28 @@ static struct sun8i_ss_alg_template ss_algs[] = {
                                .cra_blocksize = SHA1_BLOCK_SIZE,
                                .cra_ctxsize = sizeof(struct sun8i_ss_hash_tfm_ctx),
                                .cra_module = THIS_MODULE,
-                               .cra_init = sun8i_ss_hash_crainit,
-                               .cra_exit = sun8i_ss_hash_craexit,
                        }
                }
-       }
+       },
+       .alg.hash.op = {
+               .do_one_request = sun8i_ss_hash_run,
+       },
 },
 #endif
 };
 
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
 static int sun8i_ss_debugfs_show(struct seq_file *seq, void *v)
 {
-       struct sun8i_ss_dev *ss = seq->private;
+       struct sun8i_ss_dev *ss __maybe_unused = seq->private;
        unsigned int i;
 
        for (i = 0; i < MAXFLOW; i++)
-               seq_printf(seq, "Channel %d: nreq %lu\n", i, ss->flows[i].stat_req);
+               seq_printf(seq, "Channel %d: nreq %lu\n", i,
+#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
+                          ss->flows[i].stat_req);
+#else
+                          0ul);
+#endif
 
        for (i = 0; i < ARRAY_SIZE(ss_algs); i++) {
                if (!ss_algs[i].ss)
@@ -459,8 +492,8 @@ static int sun8i_ss_debugfs_show(struct seq_file *seq, void *v)
                switch (ss_algs[i].type) {
                case CRYPTO_ALG_TYPE_SKCIPHER:
                        seq_printf(seq, "%s %s reqs=%lu fallback=%lu\n",
-                                  ss_algs[i].alg.skcipher.base.cra_driver_name,
-                                  ss_algs[i].alg.skcipher.base.cra_name,
+                                  ss_algs[i].alg.skcipher.base.base.cra_driver_name,
+                                  ss_algs[i].alg.skcipher.base.base.cra_name,
                                   ss_algs[i].stat_req, ss_algs[i].stat_fb);
 
                        seq_printf(seq, "\tLast fallback is: %s\n",
@@ -482,8 +515,8 @@ static int sun8i_ss_debugfs_show(struct seq_file *seq, void *v)
                        break;
                case CRYPTO_ALG_TYPE_AHASH:
                        seq_printf(seq, "%s %s reqs=%lu fallback=%lu\n",
-                                  ss_algs[i].alg.hash.halg.base.cra_driver_name,
-                                  ss_algs[i].alg.hash.halg.base.cra_name,
+                                  ss_algs[i].alg.hash.base.halg.base.cra_driver_name,
+                                  ss_algs[i].alg.hash.base.halg.base.cra_name,
                                   ss_algs[i].stat_req, ss_algs[i].stat_fb);
                        seq_printf(seq, "\tLast fallback is: %s\n",
                                   ss_algs[i].fbname);
@@ -502,7 +535,6 @@ static int sun8i_ss_debugfs_show(struct seq_file *seq, void *v)
 }
 
 DEFINE_SHOW_ATTRIBUTE(sun8i_ss_debugfs);
-#endif
 
 static void sun8i_ss_free_flows(struct sun8i_ss_dev *ss, int i)
 {
@@ -659,7 +691,7 @@ static int sun8i_ss_register_algs(struct sun8i_ss_dev *ss)
                        if (ss_method == SS_ID_NOTSUPP) {
                                dev_info(ss->dev,
                                         "DEBUG: Algo of %s not supported\n",
-                                        ss_algs[i].alg.skcipher.base.cra_name);
+                                        ss_algs[i].alg.skcipher.base.base.cra_name);
                                ss_algs[i].ss = NULL;
                                break;
                        }
@@ -667,16 +699,16 @@ static int sun8i_ss_register_algs(struct sun8i_ss_dev *ss)
                        ss_method = ss->variant->op_mode[id];
                        if (ss_method == SS_ID_NOTSUPP) {
                                dev_info(ss->dev, "DEBUG: Blockmode of %s not supported\n",
-                                        ss_algs[i].alg.skcipher.base.cra_name);
+                                        ss_algs[i].alg.skcipher.base.base.cra_name);
                                ss_algs[i].ss = NULL;
                                break;
                        }
                        dev_info(ss->dev, "DEBUG: Register %s\n",
-                                ss_algs[i].alg.skcipher.base.cra_name);
-                       err = crypto_register_skcipher(&ss_algs[i].alg.skcipher);
+                                ss_algs[i].alg.skcipher.base.base.cra_name);
+                       err = crypto_engine_register_skcipher(&ss_algs[i].alg.skcipher);
                        if (err) {
                                dev_err(ss->dev, "Fail to register %s\n",
-                                       ss_algs[i].alg.skcipher.base.cra_name);
+                                       ss_algs[i].alg.skcipher.base.base.cra_name);
                                ss_algs[i].ss = NULL;
                                return err;
                        }
@@ -695,16 +727,16 @@ static int sun8i_ss_register_algs(struct sun8i_ss_dev *ss)
                        if (ss_method == SS_ID_NOTSUPP) {
                                dev_info(ss->dev,
                                        "DEBUG: Algo of %s not supported\n",
-                                       ss_algs[i].alg.hash.halg.base.cra_name);
+                                       ss_algs[i].alg.hash.base.halg.base.cra_name);
                                ss_algs[i].ss = NULL;
                                break;
                        }
                        dev_info(ss->dev, "Register %s\n",
-                                ss_algs[i].alg.hash.halg.base.cra_name);
-                       err = crypto_register_ahash(&ss_algs[i].alg.hash);
+                                ss_algs[i].alg.hash.base.halg.base.cra_name);
+                       err = crypto_engine_register_ahash(&ss_algs[i].alg.hash);
                        if (err) {
                                dev_err(ss->dev, "ERROR: Fail to register %s\n",
-                                       ss_algs[i].alg.hash.halg.base.cra_name);
+                                       ss_algs[i].alg.hash.base.halg.base.cra_name);
                                ss_algs[i].ss = NULL;
                                return err;
                        }
@@ -727,8 +759,8 @@ static void sun8i_ss_unregister_algs(struct sun8i_ss_dev *ss)
                switch (ss_algs[i].type) {
                case CRYPTO_ALG_TYPE_SKCIPHER:
                        dev_info(ss->dev, "Unregister %d %s\n", i,
-                                ss_algs[i].alg.skcipher.base.cra_name);
-                       crypto_unregister_skcipher(&ss_algs[i].alg.skcipher);
+                                ss_algs[i].alg.skcipher.base.base.cra_name);
+                       crypto_engine_unregister_skcipher(&ss_algs[i].alg.skcipher);
                        break;
                case CRYPTO_ALG_TYPE_RNG:
                        dev_info(ss->dev, "Unregister %d %s\n", i,
@@ -737,8 +769,8 @@ static void sun8i_ss_unregister_algs(struct sun8i_ss_dev *ss)
                        break;
                case CRYPTO_ALG_TYPE_AHASH:
                        dev_info(ss->dev, "Unregister %d %s\n", i,
-                                ss_algs[i].alg.hash.halg.base.cra_name);
-                       crypto_unregister_ahash(&ss_algs[i].alg.hash);
+                                ss_algs[i].alg.hash.base.halg.base.cra_name);
+                       crypto_engine_unregister_ahash(&ss_algs[i].alg.hash);
                        break;
                }
        }
@@ -851,13 +883,21 @@ static int sun8i_ss_probe(struct platform_device *pdev)
 
        pm_runtime_put_sync(ss->dev);
 
+       if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG)) {
+               struct dentry *dbgfs_dir __maybe_unused;
+               struct dentry *dbgfs_stats __maybe_unused;
+
+               /* Ignore error of debugfs */
+               dbgfs_dir = debugfs_create_dir("sun8i-ss", NULL);
+               dbgfs_stats = debugfs_create_file("stats", 0444,
+                                                  dbgfs_dir, ss,
+                                                  &sun8i_ss_debugfs_fops);
+
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       /* Ignore error of debugfs */
-       ss->dbgfs_dir = debugfs_create_dir("sun8i-ss", NULL);
-       ss->dbgfs_stats = debugfs_create_file("stats", 0444,
-                                             ss->dbgfs_dir, ss,
-                                             &sun8i_ss_debugfs_fops);
+               ss->dbgfs_dir = dbgfs_dir;
+               ss->dbgfs_stats = dbgfs_stats;
 #endif
+       }
 
        return 0;
 error_alg:

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
index e6865b4..d70b105 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
@@ -9,16 +9,21 @@
  *
  * You could find the datasheet in Documentation/arch/arm/sunxi.rst
  */
-#include <linux/bottom_half.h>
-#include <linux/dma-mapping.h>
-#include <linux/pm_runtime.h>
-#include <linux/scatterlist.h>
-#include <crypto/internal/hash.h>
+
 #include <crypto/hmac.h>
+#include <crypto/internal/hash.h>
+#include <crypto/md5.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/sha1.h>
 #include <crypto/sha2.h>
-#include <crypto/md5.h>
+#include <linux/bottom_half.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/pm_runtime.h>
+#include <linux/scatterlist.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include "sun8i-ss.h"
 
 static int sun8i_ss_hashkey(struct sun8i_ss_hash_tfm_ctx *tfmctx, const u8 *key,
@@ -60,14 +65,11 @@ int sun8i_ss_hmac_setkey(struct crypto_ahash *ahash, const u8 *key,
                         unsigned int keylen)
 {
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(ahash);
-       struct ahash_alg *alg = __crypto_ahash_alg(ahash->base.__crt_alg);
-       struct sun8i_ss_alg_template *algt;
        int digestsize, i;
        int bs = crypto_ahash_blocksize(ahash);
        int ret;
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
-       digestsize = algt->alg.hash.halg.digestsize;
+       digestsize = crypto_ahash_digestsize(ahash);
 
        if (keylen > bs) {
                ret = sun8i_ss_hashkey(tfmctx, key, keylen);
@@ -107,36 +109,33 @@ err_opad:
        return ret;
 }
 
-int sun8i_ss_hash_crainit(struct crypto_tfm *tfm)
+int sun8i_ss_hash_init_tfm(struct crypto_ahash *tfm)
 {
-       struct sun8i_ss_hash_tfm_ctx *op = crypto_tfm_ctx(tfm);
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->__crt_alg);
+       struct sun8i_ss_hash_tfm_ctx *op = crypto_ahash_ctx(tfm);
+       struct ahash_alg *alg = crypto_ahash_alg(tfm);
        struct sun8i_ss_alg_template *algt;
        int err;
 
-       memset(op, 0, sizeof(struct sun8i_ss_hash_tfm_ctx));
-
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash.base);
        op->ss = algt->ss;
 
-       op->enginectx.op.do_one_request = sun8i_ss_hash_run;
-
        /* 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->ss->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_ss_hash_reqctx) +
                                 crypto_ahash_reqsize(op->fallback_tfm));
 
-       memcpy(algt->fbname, crypto_tfm_alg_driver_name(&op->fallback_tfm->base), CRYPTO_MAX_ALG_NAME);
+       memcpy(algt->fbname, crypto_ahash_driver_name(op->fallback_tfm),
+              CRYPTO_MAX_ALG_NAME);
 
        err = pm_runtime_get_sync(op->ss->dev);
        if (err < 0)
@@ -148,9 +147,9 @@ error_pm:
        return err;
 }
 
-void sun8i_ss_hash_craexit(struct crypto_tfm *tfm)
+void sun8i_ss_hash_exit_tfm(struct crypto_ahash *tfm)
 {
-       struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_tfm_ctx(tfm);
+       struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        kfree_sensitive(tfmctx->ipad);
        kfree_sensitive(tfmctx->opad);
@@ -202,20 +201,23 @@ int sun8i_ss_hash_final(struct ahash_request *areq)
        struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
-       struct sun8i_ss_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_SS_DEBUG)) {
+               struct ahash_alg *alg = crypto_ahash_alg(tfm);
+               struct sun8i_ss_alg_template *algt __maybe_unused;
+
+               algt = container_of(alg, struct sun8i_ss_alg_template,
+                                   alg.hash.base);
+
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
-       algt->stat_fb++;
+               algt->stat_fb++;
 #endif
+       }
 
        return crypto_ahash_final(&rctx->fallback_req);
 }
@@ -240,10 +242,6 @@ int sun8i_ss_hash_finup(struct ahash_request *areq)
        struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
-       struct sun8i_ss_alg_template *algt;
-#endif
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
        rctx->fallback_req.base.flags = areq->base.flags &
@@ -252,10 +250,18 @@ int sun8i_ss_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_SS_DEBUG)) {
+               struct ahash_alg *alg = crypto_ahash_alg(tfm);
+               struct sun8i_ss_alg_template *algt __maybe_unused;
+
+               algt = container_of(alg, struct sun8i_ss_alg_template,
+                                   alg.hash.base);
+
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
-       algt->stat_fb++;
+               algt->stat_fb++;
 #endif
+       }
 
        return crypto_ahash_finup(&rctx->fallback_req);
 }
@@ -265,10 +271,6 @@ static int sun8i_ss_hash_digest_fb(struct ahash_request *areq)
        struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
-       struct sun8i_ss_alg_template *algt;
-#endif
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
        rctx->fallback_req.base.flags = areq->base.flags &
@@ -277,10 +279,18 @@ static int sun8i_ss_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_SS_DEBUG)) {
+               struct ahash_alg *alg = crypto_ahash_alg(tfm);
+               struct sun8i_ss_alg_template *algt __maybe_unused;
+
+               algt = container_of(alg, struct sun8i_ss_alg_template,
+                                   alg.hash.base);
+
 #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
-       algt->stat_fb++;
+               algt->stat_fb++;
 #endif
+       }
 
        return crypto_ahash_digest(&rctx->fallback_req);
 }
@@ -347,11 +357,11 @@ static int sun8i_ss_run_hash_task(struct sun8i_ss_dev *ss,
 static bool sun8i_ss_hash_need_fallback(struct ahash_request *areq)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
+       struct ahash_alg *alg = crypto_ahash_alg(tfm);
        struct sun8i_ss_alg_template *algt;
        struct scatterlist *sg;
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash.base);
 
        if (areq->nbytes == 0) {
                algt->stat_fb_len++;
@@ -396,8 +406,8 @@ static bool sun8i_ss_hash_need_fallback(struct ahash_request *areq)
 int sun8i_ss_hash_digest(struct ahash_request *areq)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
        struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
+       struct ahash_alg *alg = crypto_ahash_alg(tfm);
        struct sun8i_ss_alg_template *algt;
        struct sun8i_ss_dev *ss;
        struct crypto_engine *engine;
@@ -406,7 +416,7 @@ int sun8i_ss_hash_digest(struct ahash_request *areq)
        if (sun8i_ss_hash_need_fallback(areq))
                return sun8i_ss_hash_digest_fb(areq);
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash.base);
        ss = algt->ss;
 
        e = sun8i_ss_get_engine_number(ss);
@@ -482,8 +492,8 @@ int sun8i_ss_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 sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
-       struct ahash_alg *alg = __crypto_ahash_alg(tfm->base.__crt_alg);
        struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
+       struct ahash_alg *alg = crypto_ahash_alg(tfm);
        struct sun8i_ss_alg_template *algt;
        struct sun8i_ss_dev *ss;
        struct scatterlist *sg;
@@ -502,10 +512,10 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq)
         */
        int hmac = 0;
 
-       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
+       algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash.base);
        ss = algt->ss;
 
-       digestsize = algt->alg.hash.halg.digestsize;
+       digestsize = crypto_ahash_digestsize(tfm);
        if (digestsize == SHA224_DIGEST_SIZE)
                digestsize = SHA256_DIGEST_SIZE;
 
@@ -698,7 +708,7 @@ err_dma_result:
        }
 
        if (!err)
-               memcpy(areq->result, result, algt->alg.hash.halg.digestsize);
+               memcpy(areq->result, result, crypto_ahash_digestsize(tfm));
 theend:
        local_bh_disable();
        crypto_finalize_hash_request(engine, breq, err);

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h
index bfe3052..ae66eb4 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h
@@ -201,16 +201,12 @@ struct sun8i_cipher_req_ctx {
 
 /*
  * struct sun8i_cipher_tfm_ctx - context for a skcipher TFM
- * @enginectx:         crypto_engine used by this TFM
  * @key:               pointer to key data
  * @keylen:            len of the key
  * @ss:                        pointer to the private data of driver handling this TFM
  * @fallback_tfm:      pointer to the fallback TFM
- *
- * enginectx must be the first element
  */
 struct sun8i_cipher_tfm_ctx {
-       struct crypto_engine_ctx enginectx;
        u32 *key;
        u32 keylen;
        struct sun8i_ss_dev *ss;
@@ -229,14 +225,10 @@ struct sun8i_ss_rng_tfm_ctx {
 
 /*
  * struct sun8i_ss_hash_tfm_ctx - context for an ahash TFM
- * @enginectx:         crypto_engine used by this TFM
  * @fallback_tfm:      pointer to the fallback TFM
  * @ss:                        pointer to the private data of driver handling this TFM
- *
- * enginectx must be the first element
  */
 struct sun8i_ss_hash_tfm_ctx {
-       struct crypto_engine_ctx enginectx;
        struct crypto_ahash *fallback_tfm;
        struct sun8i_ss_dev *ss;
        u8 *ipad;
@@ -279,9 +271,9 @@ struct sun8i_ss_alg_template {
        u32 ss_blockmode;
        struct sun8i_ss_dev *ss;
        union {
-               struct skcipher_alg skcipher;
+               struct skcipher_engine_alg skcipher;
                struct rng_alg rng;
-               struct ahash_alg hash;
+               struct ahash_engine_alg hash;
        } alg;
        unsigned long stat_req;
        unsigned long stat_fb;
@@ -299,6 +291,7 @@ int sun8i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,
                         unsigned int keylen);
 int sun8i_ss_cipher_init(struct crypto_tfm *tfm);
 void sun8i_ss_cipher_exit(struct crypto_tfm *tfm);
+int sun8i_ss_handle_cipher_request(struct crypto_engine *engine, void *areq);
 int sun8i_ss_skdecrypt(struct skcipher_request *areq);
 int sun8i_ss_skencrypt(struct skcipher_request *areq);
 
@@ -311,8 +304,8 @@ int sun8i_ss_prng_seed(struct crypto_rng *tfm, const u8 *seed, unsigned int slen
 int sun8i_ss_prng_init(struct crypto_tfm *tfm);
 void sun8i_ss_prng_exit(struct crypto_tfm *tfm);
 
-int sun8i_ss_hash_crainit(struct crypto_tfm *tfm);
-void sun8i_ss_hash_craexit(struct crypto_tfm *tfm);
+int sun8i_ss_hash_init_tfm(struct crypto_ahash *tfm);
+void sun8i_ss_hash_exit_tfm(struct crypto_ahash *tfm);
 int sun8i_ss_hash_init(struct ahash_request *areq);
 int sun8i_ss_hash_export(struct ahash_request *areq, void *out);
 int sun8i_ss_hash_import(struct ahash_request *areq, const void *in);