Skip to content

L
linux
Commit 4c19e8fb authored by Herbert Xu's avatar Herbert Xu
Browse files
Options

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 07e34cd3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 131 deletions
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c
View file @ 4c19e8fb
...@@ -24,7 +24,7 @@ static bool sun8i_ss_need_fallback(struct skcipher_request *areq) ...@@ -24,7 +24,7 @@ static bool sun8i_ss_need_fallback(struct skcipher_request *areq)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(areq);
struct skcipher_alg *alg = crypto_skcipher_alg(tfm); 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 *in_sg = areq->src;
struct scatterlist *out_sg = areq->dst; struct scatterlist *out_sg = areq->dst;
struct scatterlist *sg; struct scatterlist *sg;
...@@ -93,13 +93,18 @@ static int sun8i_ss_cipher_fallback(struct skcipher_request *areq) ...@@ -93,13 +93,18 @@ static int sun8i_ss_cipher_fallback(struct skcipher_request *areq)
struct sun8i_cipher_req_ctx *rctx = skcipher_request_ctx(areq); struct sun8i_cipher_req_ctx *rctx = skcipher_request_ctx(areq);
int err; int err;
#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG)) {
struct skcipher_alg *alg = crypto_skcipher_alg(tfm); struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
struct sun8i_ss_alg_template *algt; 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); #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
algt->stat_fb++; algt->stat_fb++;
#endif #endif
}
skcipher_request_set_tfm(&rctx->fallback_req, op->fallback_tfm); skcipher_request_set_tfm(&rctx->fallback_req, op->fallback_tfm);
skcipher_request_set_callback(&rctx->fallback_req, areq->base.flags, skcipher_request_set_callback(&rctx->fallback_req, areq->base.flags,
areq->base.complete, areq->base.data); areq->base.complete, areq->base.data);
...@@ -193,7 +198,7 @@ static int sun8i_ss_cipher(struct skcipher_request *areq) ...@@ -193,7 +198,7 @@ static int sun8i_ss_cipher(struct skcipher_request *areq)
int nsgd = sg_nents_for_len(areq->dst, areq->cryptlen); int nsgd = sg_nents_for_len(areq->dst, areq->cryptlen);
int i; 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__, dev_dbg(ss->dev, "%s %s %u %x IV(%p %u) key=%u\n", __func__,
crypto_tfm_alg_name(areq->base.tfm), crypto_tfm_alg_name(areq->base.tfm),
...@@ -324,7 +329,7 @@ static int sun8i_ss_cipher(struct skcipher_request *areq) ...@@ -324,7 +329,7 @@ static int sun8i_ss_cipher(struct skcipher_request *areq)
return err; 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; int err;
struct skcipher_request *breq = container_of(areq, struct skcipher_request, base); struct skcipher_request *breq = container_of(areq, struct skcipher_request, base);
...@@ -390,7 +395,7 @@ int sun8i_ss_cipher_init(struct crypto_tfm *tfm) ...@@ -390,7 +395,7 @@ int sun8i_ss_cipher_init(struct crypto_tfm *tfm)
memset(op, 0, sizeof(struct sun8i_cipher_tfm_ctx)); 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->ss = algt->ss;
op->fallback_tfm = crypto_alloc_skcipher(name, 0, CRYPTO_ALG_NEED_FALLBACK); 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) ...@@ -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_tfm_alg_driver_name(crypto_skcipher_tfm(op->fallback_tfm)),
CRYPTO_MAX_ALG_NAME); CRYPTO_MAX_ALG_NAME);
op->enginectx.op.do_one_request = sun8i_ss_handle_cipher_request;
err = pm_runtime_resume_and_get(op->ss->dev); err = pm_runtime_resume_and_get(op->ss->dev);
if (err < 0) { if (err < 0) {
dev_err(op->ss->dev, "pm error %d\n", err); dev_err(op->ss->dev, "pm error %d\n", err);
......
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
View file @ 4c19e8fb
...@@ -9,16 +9,21 @@ ...@@ -9,16 +9,21 @@
* *
* You could find the datasheet in Documentation/arch/arm/sunxi.rst * 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/hmac.h>
#include <crypto/internal/hash.h>
#include <crypto/md5.h>
#include <crypto/scatterwalk.h> #include <crypto/scatterwalk.h>
#include <crypto/sha1.h> #include <crypto/sha1.h>
#include <crypto/sha2.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" #include "sun8i-ss.h"
static int sun8i_ss_hashkey(struct sun8i_ss_hash_tfm_ctx *tfmctx, const u8 *key, 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, ...@@ -60,14 +65,11 @@ int sun8i_ss_hmac_setkey(struct crypto_ahash *ahash, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(ahash); 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 digestsize, i;
int bs = crypto_ahash_blocksize(ahash); int bs = crypto_ahash_blocksize(ahash);
int ret; int ret;
algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash); digestsize = crypto_ahash_digestsize(ahash);
digestsize = algt->alg.hash.halg.digestsize;
if (keylen > bs) { if (keylen > bs) {
ret = sun8i_ss_hashkey(tfmctx, key, keylen); ret = sun8i_ss_hashkey(tfmctx, key, keylen);
...@@ -107,36 +109,33 @@ int sun8i_ss_hmac_setkey(struct crypto_ahash *ahash, const u8 *key, ...@@ -107,36 +109,33 @@ int sun8i_ss_hmac_setkey(struct crypto_ahash *ahash, const u8 *key,
return ret; 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 sun8i_ss_hash_tfm_ctx *op = crypto_ahash_ctx(tfm);
struct ahash_alg *alg = __crypto_ahash_alg(tfm->__crt_alg); struct ahash_alg *alg = crypto_ahash_alg(tfm);
struct sun8i_ss_alg_template *algt; struct sun8i_ss_alg_template *algt;
int err; int err;
memset(op, 0, sizeof(struct sun8i_ss_hash_tfm_ctx)); algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash.base);
algt = container_of(alg, struct sun8i_ss_alg_template, alg.hash);
op->ss = algt->ss; op->ss = algt->ss;
op->enginectx.op.do_one_request = sun8i_ss_hash_run;
/* FALLBACK */ /* 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); CRYPTO_ALG_NEED_FALLBACK);
if (IS_ERR(op->fallback_tfm)) { if (IS_ERR(op->fallback_tfm)) {
dev_err(algt->ss->dev, "Fallback driver could no be loaded\n"); dev_err(algt->ss->dev, "Fallback driver could no be loaded\n");
return PTR_ERR(op->fallback_tfm); return PTR_ERR(op->fallback_tfm);
} }
if (algt->alg.hash.halg.statesize < crypto_ahash_statesize(op->fallback_tfm)) crypto_ahash_set_statesize(tfm,
algt->alg.hash.halg.statesize = crypto_ahash_statesize(op->fallback_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) + sizeof(struct sun8i_ss_hash_reqctx) +
crypto_ahash_reqsize(op->fallback_tfm)); 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); err = pm_runtime_get_sync(op->ss->dev);
if (err < 0) if (err < 0)
...@@ -148,9 +147,9 @@ int sun8i_ss_hash_crainit(struct crypto_tfm *tfm) ...@@ -148,9 +147,9 @@ int sun8i_ss_hash_crainit(struct crypto_tfm *tfm)
return err; 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->ipad);
kfree_sensitive(tfmctx->opad); kfree_sensitive(tfmctx->opad);
...@@ -202,20 +201,23 @@ int sun8i_ss_hash_final(struct ahash_request *areq) ...@@ -202,20 +201,23 @@ int sun8i_ss_hash_final(struct ahash_request *areq)
struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq); struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); 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); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
rctx->fallback_req.base.flags = areq->base.flags & rctx->fallback_req.base.flags = areq->base.flags &
CRYPTO_TFM_REQ_MAY_SLEEP; CRYPTO_TFM_REQ_MAY_SLEEP;
rctx->fallback_req.result = areq->result; 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 #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 #endif
}
return crypto_ahash_final(&rctx->fallback_req); return crypto_ahash_final(&rctx->fallback_req);
} }
...@@ -240,10 +242,6 @@ int sun8i_ss_hash_finup(struct ahash_request *areq) ...@@ -240,10 +242,6 @@ int sun8i_ss_hash_finup(struct ahash_request *areq)
struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq); struct sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); 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); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
rctx->fallback_req.base.flags = areq->base.flags & rctx->fallback_req.base.flags = areq->base.flags &
...@@ -252,10 +250,18 @@ int sun8i_ss_hash_finup(struct ahash_request *areq) ...@@ -252,10 +250,18 @@ int sun8i_ss_hash_finup(struct ahash_request *areq)
rctx->fallback_req.nbytes = areq->nbytes; rctx->fallback_req.nbytes = areq->nbytes;
rctx->fallback_req.src = areq->src; rctx->fallback_req.src = areq->src;
rctx->fallback_req.result = areq->result; 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 #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 #endif
}
return crypto_ahash_finup(&rctx->fallback_req); return crypto_ahash_finup(&rctx->fallback_req);
} }
...@@ -265,10 +271,6 @@ static int sun8i_ss_hash_digest_fb(struct ahash_request *areq) ...@@ -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 sun8i_ss_hash_reqctx *rctx = ahash_request_ctx(areq);
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); 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); ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
rctx->fallback_req.base.flags = areq->base.flags & rctx->fallback_req.base.flags = areq->base.flags &
...@@ -277,10 +279,18 @@ static int sun8i_ss_hash_digest_fb(struct ahash_request *areq) ...@@ -277,10 +279,18 @@ static int sun8i_ss_hash_digest_fb(struct ahash_request *areq)
rctx->fallback_req.nbytes = areq->nbytes; rctx->fallback_req.nbytes = areq->nbytes;
rctx->fallback_req.src = areq->src; rctx->fallback_req.src = areq->src;
rctx->fallback_req.result = areq->result; 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 #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 #endif
}
return crypto_ahash_digest(&rctx->fallback_req); return crypto_ahash_digest(&rctx->fallback_req);
} }
...@@ -347,11 +357,11 @@ static int sun8i_ss_run_hash_task(struct sun8i_ss_dev *ss, ...@@ -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) static bool sun8i_ss_hash_need_fallback(struct ahash_request *areq)
{ {
struct crypto_ahash *tfm = crypto_ahash_reqtfm(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 sun8i_ss_alg_template *algt;
struct scatterlist *sg; 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) { if (areq->nbytes == 0) {
algt->stat_fb_len++; algt->stat_fb_len++;
...@@ -396,8 +406,8 @@ static bool sun8i_ss_hash_need_fallback(struct ahash_request *areq) ...@@ -396,8 +406,8 @@ static bool sun8i_ss_hash_need_fallback(struct ahash_request *areq)
int sun8i_ss_hash_digest(struct ahash_request *areq) int sun8i_ss_hash_digest(struct ahash_request *areq)
{ {
struct crypto_ahash *tfm = crypto_ahash_reqtfm(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 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_alg_template *algt;
struct sun8i_ss_dev *ss; struct sun8i_ss_dev *ss;
struct crypto_engine *engine; struct crypto_engine *engine;
...@@ -406,7 +416,7 @@ int sun8i_ss_hash_digest(struct ahash_request *areq) ...@@ -406,7 +416,7 @@ int sun8i_ss_hash_digest(struct ahash_request *areq)
if (sun8i_ss_hash_need_fallback(areq)) if (sun8i_ss_hash_need_fallback(areq))
return sun8i_ss_hash_digest_fb(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; ss = algt->ss;
e = sun8i_ss_get_engine_number(ss); e = sun8i_ss_get_engine_number(ss);
...@@ -482,8 +492,8 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq) ...@@ -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 ahash_request *areq = container_of(breq, struct ahash_request, base);
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm); 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 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_alg_template *algt;
struct sun8i_ss_dev *ss; struct sun8i_ss_dev *ss;
struct scatterlist *sg; struct scatterlist *sg;
...@@ -502,10 +512,10 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq) ...@@ -502,10 +512,10 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq)
*/ */
int hmac = 0; 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; ss = algt->ss;
digestsize = algt->alg.hash.halg.digestsize; digestsize = crypto_ahash_digestsize(tfm);
if (digestsize == SHA224_DIGEST_SIZE) if (digestsize == SHA224_DIGEST_SIZE)
digestsize = SHA256_DIGEST_SIZE; digestsize = SHA256_DIGEST_SIZE;
...@@ -698,7 +708,7 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq) ...@@ -698,7 +708,7 @@ int sun8i_ss_hash_run(struct crypto_engine *engine, void *breq)
} }
if (!err) if (!err)
memcpy(areq->result, result, algt->alg.hash.halg.digestsize); memcpy(areq->result, result, crypto_ahash_digestsize(tfm));
theend: theend:
local_bh_disable(); local_bh_disable();
crypto_finalize_hash_request(engine, breq, err); crypto_finalize_hash_request(engine, breq, err);
......
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h
View file @ 4c19e8fb
...@@ -201,16 +201,12 @@ struct sun8i_cipher_req_ctx { ...@@ -201,16 +201,12 @@ struct sun8i_cipher_req_ctx {
/* /*
* struct sun8i_cipher_tfm_ctx - context for a skcipher TFM * struct sun8i_cipher_tfm_ctx - context for a skcipher TFM
* @enginectx: crypto_engine used by this TFM
* @key: pointer to key data * @key: pointer to key data
* @keylen: len of the key * @keylen: len of the key
* @ss: pointer to the private data of driver handling this TFM * @ss: pointer to the private data of driver handling this TFM
* @fallback_tfm: pointer to the fallback TFM * @fallback_tfm: pointer to the fallback TFM
*
* enginectx must be the first element
*/ */
struct sun8i_cipher_tfm_ctx { struct sun8i_cipher_tfm_ctx {
struct crypto_engine_ctx enginectx;
u32 *key; u32 *key;
u32 keylen; u32 keylen;
struct sun8i_ss_dev *ss; struct sun8i_ss_dev *ss;
...@@ -229,14 +225,10 @@ struct sun8i_ss_rng_tfm_ctx { ...@@ -229,14 +225,10 @@ struct sun8i_ss_rng_tfm_ctx {
/* /*
* struct sun8i_ss_hash_tfm_ctx - context for an ahash TFM * 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 * @fallback_tfm: pointer to the fallback TFM
* @ss: pointer to the private data of driver handling this 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 sun8i_ss_hash_tfm_ctx {
struct crypto_engine_ctx enginectx;
struct crypto_ahash *fallback_tfm; struct crypto_ahash *fallback_tfm;
struct sun8i_ss_dev *ss; struct sun8i_ss_dev *ss;
u8 *ipad; u8 *ipad;
...@@ -279,9 +271,9 @@ struct sun8i_ss_alg_template { ...@@ -279,9 +271,9 @@ struct sun8i_ss_alg_template {
u32 ss_blockmode; u32 ss_blockmode;
struct sun8i_ss_dev *ss; struct sun8i_ss_dev *ss;
union { union {
struct skcipher_alg skcipher; struct skcipher_engine_alg skcipher;
struct rng_alg rng; struct rng_alg rng;
struct ahash_alg hash; struct ahash_engine_alg hash;
} alg; } alg;
unsigned long stat_req; unsigned long stat_req;
unsigned long stat_fb; unsigned long stat_fb;
...@@ -299,6 +291,7 @@ int sun8i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key, ...@@ -299,6 +291,7 @@ int sun8i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen); unsigned int keylen);
int sun8i_ss_cipher_init(struct crypto_tfm *tfm); int sun8i_ss_cipher_init(struct crypto_tfm *tfm);
void sun8i_ss_cipher_exit(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_skdecrypt(struct skcipher_request *areq);
int sun8i_ss_skencrypt(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 ...@@ -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); int sun8i_ss_prng_init(struct crypto_tfm *tfm);
void sun8i_ss_prng_exit(struct crypto_tfm *tfm); void sun8i_ss_prng_exit(struct crypto_tfm *tfm);
int sun8i_ss_hash_crainit(struct crypto_tfm *tfm); int sun8i_ss_hash_init_tfm(struct crypto_ahash *tfm);
void sun8i_ss_hash_craexit(struct crypto_tfm *tfm); void sun8i_ss_hash_exit_tfm(struct crypto_ahash *tfm);
int sun8i_ss_hash_init(struct ahash_request *areq); int sun8i_ss_hash_init(struct ahash_request *areq);
int sun8i_ss_hash_export(struct ahash_request *areq, void *out); int sun8i_ss_hash_export(struct ahash_request *areq, void *out);
int sun8i_ss_hash_import(struct ahash_request *areq, const void *in); int sun8i_ss_hash_import(struct ahash_request *areq, const void *in);
......
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