Skip to content

L
linux
Commit 982213e4 authored by Herbert Xu's avatar Herbert Xu
Browse files
Options

crypto: jh7110 - 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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1a15d26c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 205 deletions
drivers/crypto/starfive/jh7110-aes.c
View file @ 982213e4
...@@ -5,12 +5,17 @@ ...@@ -5,12 +5,17 @@
* Copyright (c) 2022 StarFive Technology * Copyright (c) 2022 StarFive Technology
*/ */
#include <linux/iopoll.h> #include <crypto/engine.h>
#include <crypto/gcm.h> #include <crypto/gcm.h>
#include <crypto/scatterwalk.h>
#include <crypto/internal/aead.h> #include <crypto/internal/aead.h>
#include <crypto/internal/skcipher.h> #include <crypto/internal/skcipher.h>
#include <crypto/scatterwalk.h>
#include "jh7110-cryp.h" #include "jh7110-cryp.h"
#include <linux/err.h>
#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/string.h>
#define STARFIVE_AES_REGS_OFFSET 0x100 #define STARFIVE_AES_REGS_OFFSET 0x100
#define STARFIVE_AES_AESDIO0R (STARFIVE_AES_REGS_OFFSET + 0x0) #define STARFIVE_AES_AESDIO0R (STARFIVE_AES_REGS_OFFSET + 0x0)
...@@ -554,8 +559,6 @@ static int starfive_aes_init_tfm(struct crypto_skcipher *tfm) ...@@ -554,8 +559,6 @@ static int starfive_aes_init_tfm(struct crypto_skcipher *tfm)
crypto_skcipher_set_reqsize(tfm, sizeof(struct starfive_cryp_request_ctx) + crypto_skcipher_set_reqsize(tfm, sizeof(struct starfive_cryp_request_ctx) +
sizeof(struct skcipher_request)); sizeof(struct skcipher_request));
ctx->enginectx.op.do_one_request = starfive_aes_do_one_req;
return 0; return 0;
} }
...@@ -638,8 +641,6 @@ static int starfive_aes_aead_init_tfm(struct crypto_aead *tfm) ...@@ -638,8 +641,6 @@ static int starfive_aes_aead_init_tfm(struct crypto_aead *tfm)
crypto_aead_set_reqsize(tfm, sizeof(struct starfive_cryp_ctx) + crypto_aead_set_reqsize(tfm, sizeof(struct starfive_cryp_ctx) +
sizeof(struct aead_request)); sizeof(struct aead_request));
ctx->enginectx.op.do_one_request = starfive_aes_aead_do_one_req;
return 0; return 0;
} }
...@@ -844,15 +845,15 @@ static int starfive_aes_ccm_decrypt(struct aead_request *req) ...@@ -844,15 +845,15 @@ static int starfive_aes_ccm_decrypt(struct aead_request *req)
return starfive_aes_aead_crypt(req, STARFIVE_AES_MODE_CCM); return starfive_aes_aead_crypt(req, STARFIVE_AES_MODE_CCM);
} }
static struct skcipher_alg skcipher_algs[] = { static struct skcipher_engine_alg skcipher_algs[] = {
{ {
.init = starfive_aes_init_tfm, .base.init = starfive_aes_init_tfm,
.setkey = starfive_aes_setkey, .base.setkey = starfive_aes_setkey,
.encrypt = starfive_aes_ecb_encrypt, .base.encrypt = starfive_aes_ecb_encrypt,
.decrypt = starfive_aes_ecb_decrypt, .base.decrypt = starfive_aes_ecb_decrypt,
.min_keysize = AES_MIN_KEY_SIZE, .base.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .base.max_keysize = AES_MAX_KEY_SIZE,
.base = { .base.base = {
.cra_name = "ecb(aes)", .cra_name = "ecb(aes)",
.cra_driver_name = "starfive-ecb-aes", .cra_driver_name = "starfive-ecb-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -862,15 +863,18 @@ static struct skcipher_alg skcipher_algs[] = { ...@@ -862,15 +863,18 @@ static struct skcipher_alg skcipher_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_do_one_req,
},
}, { }, {
.init = starfive_aes_init_tfm, .base.init = starfive_aes_init_tfm,
.setkey = starfive_aes_setkey, .base.setkey = starfive_aes_setkey,
.encrypt = starfive_aes_cbc_encrypt, .base.encrypt = starfive_aes_cbc_encrypt,
.decrypt = starfive_aes_cbc_decrypt, .base.decrypt = starfive_aes_cbc_decrypt,
.min_keysize = AES_MIN_KEY_SIZE, .base.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .base.max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE, .base.ivsize = AES_BLOCK_SIZE,
.base = { .base.base = {
.cra_name = "cbc(aes)", .cra_name = "cbc(aes)",
.cra_driver_name = "starfive-cbc-aes", .cra_driver_name = "starfive-cbc-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -880,15 +884,18 @@ static struct skcipher_alg skcipher_algs[] = { ...@@ -880,15 +884,18 @@ static struct skcipher_alg skcipher_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_do_one_req,
},
}, { }, {
.init = starfive_aes_init_tfm, .base.init = starfive_aes_init_tfm,
.setkey = starfive_aes_setkey, .base.setkey = starfive_aes_setkey,
.encrypt = starfive_aes_ctr_encrypt, .base.encrypt = starfive_aes_ctr_encrypt,
.decrypt = starfive_aes_ctr_decrypt, .base.decrypt = starfive_aes_ctr_decrypt,
.min_keysize = AES_MIN_KEY_SIZE, .base.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .base.max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE, .base.ivsize = AES_BLOCK_SIZE,
.base = { .base.base = {
.cra_name = "ctr(aes)", .cra_name = "ctr(aes)",
.cra_driver_name = "starfive-ctr-aes", .cra_driver_name = "starfive-ctr-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -898,15 +905,18 @@ static struct skcipher_alg skcipher_algs[] = { ...@@ -898,15 +905,18 @@ static struct skcipher_alg skcipher_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_do_one_req,
},
}, { }, {
.init = starfive_aes_init_tfm, .base.init = starfive_aes_init_tfm,
.setkey = starfive_aes_setkey, .base.setkey = starfive_aes_setkey,
.encrypt = starfive_aes_cfb_encrypt, .base.encrypt = starfive_aes_cfb_encrypt,
.decrypt = starfive_aes_cfb_decrypt, .base.decrypt = starfive_aes_cfb_decrypt,
.min_keysize = AES_MIN_KEY_SIZE, .base.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .base.max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE, .base.ivsize = AES_BLOCK_SIZE,
.base = { .base.base = {
.cra_name = "cfb(aes)", .cra_name = "cfb(aes)",
.cra_driver_name = "starfive-cfb-aes", .cra_driver_name = "starfive-cfb-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -916,15 +926,18 @@ static struct skcipher_alg skcipher_algs[] = { ...@@ -916,15 +926,18 @@ static struct skcipher_alg skcipher_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_do_one_req,
},
}, { }, {
.init = starfive_aes_init_tfm, .base.init = starfive_aes_init_tfm,
.setkey = starfive_aes_setkey, .base.setkey = starfive_aes_setkey,
.encrypt = starfive_aes_ofb_encrypt, .base.encrypt = starfive_aes_ofb_encrypt,
.decrypt = starfive_aes_ofb_decrypt, .base.decrypt = starfive_aes_ofb_decrypt,
.min_keysize = AES_MIN_KEY_SIZE, .base.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .base.max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE, .base.ivsize = AES_BLOCK_SIZE,
.base = { .base.base = {
.cra_name = "ofb(aes)", .cra_name = "ofb(aes)",
.cra_driver_name = "starfive-ofb-aes", .cra_driver_name = "starfive-ofb-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -934,20 +947,23 @@ static struct skcipher_alg skcipher_algs[] = { ...@@ -934,20 +947,23 @@ static struct skcipher_alg skcipher_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_do_one_req,
},
}, },
}; };
static struct aead_alg aead_algs[] = { static struct aead_engine_alg aead_algs[] = {
{ {
.setkey = starfive_aes_aead_setkey, .base.setkey = starfive_aes_aead_setkey,
.setauthsize = starfive_aes_gcm_setauthsize, .base.setauthsize = starfive_aes_gcm_setauthsize,
.encrypt = starfive_aes_gcm_encrypt, .base.encrypt = starfive_aes_gcm_encrypt,
.decrypt = starfive_aes_gcm_decrypt, .base.decrypt = starfive_aes_gcm_decrypt,
.init = starfive_aes_aead_init_tfm, .base.init = starfive_aes_aead_init_tfm,
.exit = starfive_aes_aead_exit_tfm, .base.exit = starfive_aes_aead_exit_tfm,
.ivsize = GCM_AES_IV_SIZE, .base.ivsize = GCM_AES_IV_SIZE,
.maxauthsize = AES_BLOCK_SIZE, .base.maxauthsize = AES_BLOCK_SIZE,
.base = { .base.base = {
.cra_name = "gcm(aes)", .cra_name = "gcm(aes)",
.cra_driver_name = "starfive-gcm-aes", .cra_driver_name = "starfive-gcm-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -957,16 +973,19 @@ static struct aead_alg aead_algs[] = { ...@@ -957,16 +973,19 @@ static struct aead_alg aead_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_aead_do_one_req,
},
}, { }, {
.setkey = starfive_aes_aead_setkey, .base.setkey = starfive_aes_aead_setkey,
.setauthsize = starfive_aes_ccm_setauthsize, .base.setauthsize = starfive_aes_ccm_setauthsize,
.encrypt = starfive_aes_ccm_encrypt, .base.encrypt = starfive_aes_ccm_encrypt,
.decrypt = starfive_aes_ccm_decrypt, .base.decrypt = starfive_aes_ccm_decrypt,
.init = starfive_aes_aead_init_tfm, .base.init = starfive_aes_aead_init_tfm,
.exit = starfive_aes_aead_exit_tfm, .base.exit = starfive_aes_aead_exit_tfm,
.ivsize = AES_BLOCK_SIZE, .base.ivsize = AES_BLOCK_SIZE,
.maxauthsize = AES_BLOCK_SIZE, .base.maxauthsize = AES_BLOCK_SIZE,
.base = { .base.base = {
.cra_name = "ccm(aes)", .cra_name = "ccm(aes)",
.cra_driver_name = "starfive-ccm-aes", .cra_driver_name = "starfive-ccm-aes",
.cra_priority = 200, .cra_priority = 200,
...@@ -977,6 +996,9 @@ static struct aead_alg aead_algs[] = { ...@@ -977,6 +996,9 @@ static struct aead_alg aead_algs[] = {
.cra_alignmask = 0xf, .cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
.op = {
.do_one_request = starfive_aes_aead_do_one_req,
},
}, },
}; };
...@@ -984,19 +1006,19 @@ int starfive_aes_register_algs(void) ...@@ -984,19 +1006,19 @@ int starfive_aes_register_algs(void)
{ {
int ret; int ret;
ret = crypto_register_skciphers(skcipher_algs, ARRAY_SIZE(skcipher_algs)); ret = crypto_engine_register_skciphers(skcipher_algs, ARRAY_SIZE(skcipher_algs));
if (ret) if (ret)
return ret; return ret;
ret = crypto_register_aeads(aead_algs, ARRAY_SIZE(aead_algs)); ret = crypto_engine_register_aeads(aead_algs, ARRAY_SIZE(aead_algs));
if (ret) if (ret)
crypto_unregister_skciphers(skcipher_algs, ARRAY_SIZE(skcipher_algs)); crypto_engine_unregister_skciphers(skcipher_algs, ARRAY_SIZE(skcipher_algs));
return ret; return ret;
} }
void starfive_aes_unregister_algs(void) void starfive_aes_unregister_algs(void)
{ {
crypto_unregister_aeads(aead_algs, ARRAY_SIZE(aead_algs)); crypto_engine_unregister_aeads(aead_algs, ARRAY_SIZE(aead_algs));
crypto_unregister_skciphers(skcipher_algs, ARRAY_SIZE(skcipher_algs)); crypto_engine_unregister_skciphers(skcipher_algs, ARRAY_SIZE(skcipher_algs));
} }
drivers/crypto/starfive/jh7110-cryp.c
View file @ 982213e4
...@@ -7,17 +7,20 @@ ...@@ -7,17 +7,20 @@
* *
*/ */
#include <crypto/engine.h>
#include "jh7110-cryp.h"
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/completion.h>
#include <linux/err.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/spinlock.h>
#include "jh7110-cryp.h"
#define DRIVER_NAME "jh7110-crypto" #define DRIVER_NAME "jh7110-crypto"
......
drivers/crypto/starfive/jh7110-cryp.h
View file @ 982213e4
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#define __STARFIVE_STR_H__ #define __STARFIVE_STR_H__
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/engine.h>
#include <crypto/hash.h> #include <crypto/hash.h>
#include <crypto/scatterwalk.h> #include <crypto/scatterwalk.h>
#include <crypto/sha2.h> #include <crypto/sha2.h>
...@@ -151,7 +150,6 @@ union starfive_alg_cr { ...@@ -151,7 +150,6 @@ union starfive_alg_cr {
}; };
struct starfive_cryp_ctx { struct starfive_cryp_ctx {
struct crypto_engine_ctx enginectx;
struct starfive_cryp_dev *cryp; struct starfive_cryp_dev *cryp;
struct starfive_cryp_request_ctx *rctx; struct starfive_cryp_request_ctx *rctx;
......
drivers/crypto/starfive/jh7110-hash.c
View file @ 982213e4
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7