openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: sun4i-ss - Always use sun4i_tfm_ctx for storing pointer to dev ss 

The dev *ss is stored both in sun4i_tfm_ctx and sun4i_req_ctx.
Since this pointer will never be changed during tfm life, it is better
to remove it from sun4i_req_ctx.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Corentin LABBE 2016-08-10 11:45:33 +02:00 committed by Herbert Xu
parent 933e7e3ab2
commit 9b17e5ad78
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/crypto/sunxi-ss/sun4i-ss-hash.c
View File

@ -20,6 +20,15 @@
int sun4i_hash_crainit(struct crypto_tfm *tfm) int sun4i_hash_crainit(struct crypto_tfm *tfm)
{ {
struct sun4i_tfm_ctx *op = crypto_tfm_ctx(tfm);
struct ahash_alg *alg = __crypto_ahash_alg(tfm->__crt_alg);
struct sun4i_ss_alg_template *algt;
memset(op, 0, sizeof(struct sun4i_tfm_ctx));
algt = container_of(alg, struct sun4i_ss_alg_template, alg.hash);
op->ss = algt->ss;
crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm),
sizeof(struct sun4i_req_ctx)); sizeof(struct sun4i_req_ctx));
return 0; return 0;
@ -36,7 +45,6 @@ int sun4i_hash_init(struct ahash_request *areq)
memset(op, 0, sizeof(struct sun4i_req_ctx)); memset(op, 0, sizeof(struct sun4i_req_ctx));
algt = container_of(alg, struct sun4i_ss_alg_template, alg.hash); algt = container_of(alg, struct sun4i_ss_alg_template, alg.hash);
op->ss = algt->ss;
op->mode = algt->mode; op->mode = algt->mode;
return 0; return 0;
@ -168,8 +176,9 @@ int sun4i_hash(struct ahash_request *areq)
*/ */
struct sun4i_req_ctx *op = ahash_request_ctx(areq); struct sun4i_req_ctx *op = ahash_request_ctx(areq);
struct sun4i_ss_ctx *ss = op->ss;
struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
struct sun4i_ss_ctx *ss = tfmctx->ss;
unsigned int in_i = 0; /* advancement in the current SG */ unsigned int in_i = 0; /* advancement in the current SG */
unsigned int end; unsigned int end;
/* /*

1
drivers/crypto/sunxi-ss/sun4i-ss.h
View File

@ -163,7 +163,6 @@ struct sun4i_req_ctx {
u32 hash[5]; /* for storing SS_IVx register */ u32 hash[5]; /* for storing SS_IVx register */
char buf[64]; char buf[64];
unsigned int len; unsigned int len;
struct sun4i_ss_ctx *ss;
int flags; int flags;
}; };