crypto: mediatek: move mtk_aes_find_dev() to the right place
Subsystems (2)
PATCH 1/5 crypto: mediatek: move mtk_aes_find_dev() to the right place
From: Ryder Lee <[email protected]>
Move mtk_aes_find_dev() to right functions as nobody uses the 'cryp' under current flows.
We can also avoid duplicate checks here and there in this way.
--- drivers/crypto/mediatek/mtk-aes.c | 39 +++++++++++-------------------- 1 file changed, 14 insertions(+), 25 deletions(-)
drivers/crypto/mediatek/mtk-aes.c +14 -25
@@ -658,14 +658,19 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm,static int mtk_aes_crypt (struct ablkcipher_request *req,u64 mode) { -struct mtk_aes_base_ctx *ctx; +struct crypto_ablkcipher *ablkcipher =crypto_ablkcipher_reqtfm (req); +struct mtk_aes_base_ctx *ctx =crypto_ablkcipher_ctx (ablkcipher);struct mtk_aes_reqctx *rctx; +struct mtk_cryp *cryp; + + cryp =mtk_aes_find_dev (ctx); +if (!cryp) +return -ENODEV ; - ctx =crypto_ablkcipher_ctx (crypto_ablkcipher_reqtfm (req)); rctx =ablkcipher_request_ctx (req); rctx->mode = mode; -return mtk_aes_handle_queue (ctx->cryp, !(mode &AES_FLAGS_ENCRYPT ), +return mtk_aes_handle_queue (cryp, !(mode &AES_FLAGS_ENCRYPT ), &req->base); }
@@ -702,13 +707,6 @@ static int mtk_aes_ctr_decrypt(struct ablkcipher_request *req)static int mtk_aes_cra_init (struct crypto_tfm *tfm) {struct mtk_aes_ctx *ctx =crypto_tfm_ctx (tfm); -struct mtk_cryp *cryp =NULL ; - - cryp =mtk_aes_find_dev (&ctx->base); -if (!cryp) { -pr_err ("can't find crypto device\n" ); -return -ENODEV ; - } tfm->crt_ablkcipher.reqsize =sizeof (struct mtk_aes_reqctx ); ctx->base.start = mtk_aes_start;
@@ -718,13 +716,6 @@ static int mtk_aes_cra_init(struct crypto_tfm *tfm)static int mtk_aes_ctr_cra_init (struct crypto_tfm *tfm) {struct mtk_aes_ctx *ctx =crypto_tfm_ctx (tfm); -struct mtk_cryp *cryp =NULL ; - - cryp =mtk_aes_find_dev (&ctx->base); -if (!cryp) { -pr_err ("can't find crypto device\n" ); -return -ENODEV ; - } tfm->crt_ablkcipher.reqsize =sizeof (struct mtk_aes_reqctx ); ctx->base.start = mtk_aes_ctr_start;
@@ -930,6 +921,11 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode)struct mtk_aes_base_ctx *ctx =crypto_aead_ctx (crypto_aead_reqtfm (req));struct mtk_aes_gcm_ctx *gctx =mtk_aes_gcm_ctx_cast (ctx);struct mtk_aes_reqctx *rctx =aead_request_ctx (req); +struct mtk_cryp *cryp; + + cryp =mtk_aes_find_dev (ctx); +if (!cryp) +return -ENODEV ;/* Empty messages are not supported yet */ if (!gctx->textlen && !req->assoclen)
@@ -937,7 +933,7 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) rctx->mode =AES_FLAGS_GCM | mode; -return mtk_aes_handle_queue (ctx->cryp, !!(mode &AES_FLAGS_ENCRYPT ), +return mtk_aes_handle_queue (cryp, !!(mode &AES_FLAGS_ENCRYPT ), &req->base); }
@@ -1069,13 +1065,6 @@ static int mtk_aes_gcm_decrypt(struct aead_request *req)static int mtk_aes_gcm_init (struct crypto_aead *aead) {struct mtk_aes_gcm_ctx *ctx =crypto_aead_ctx (aead); -struct mtk_cryp *cryp =NULL ; - - cryp =mtk_aes_find_dev (&ctx->base); -if (!cryp) { -pr_err ("can't find crypto device\n" ); -return -ENODEV ; - } ctx->ctr =crypto_alloc_skcipher ("ctr(aes)" ,0 ,CRYPTO_ALG_ASYNC );
Signature · 1 line
2.17.1
PATCH 2/5 crypto: mediatek: fix uninitialized value of gctx->textlen
From: Ryder Lee <[email protected]>
Add a pre-computed text length to avoid uninitialized value in the check.
--- drivers/crypto/mediatek/mtk-aes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/crypto/mediatek/mtk-aes.c +5 -5
@@ -896,14 +896,11 @@ static int mtk_aes_gcm_start(struct mtk_cryp *cryp, struct mtk_aes_rec *aes) aes->resume = mtk_aes_transfer_complete;/* Compute total process length. */ aes->total = len + gctx->authsize; -/* Compute text length. */ - gctx->textlen = req->cryptlen;/* Hardware will append authenticated tag to output buffer */ scatterwalk_map_and_copy (tag, req->dst, len, gctx->authsize,1 ); }else { aes->resume = mtk_aes_gcm_tag_verify; aes->total = len; - gctx->textlen = req->cryptlen - gctx->authsize; }return mtk_aes_gcm_dma (cryp, aes, req->src, req->dst, len);
@@ -915,19 +912,22 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode)struct mtk_aes_gcm_ctx *gctx =mtk_aes_gcm_ctx_cast (ctx);struct mtk_aes_reqctx *rctx =aead_request_ctx (req);struct mtk_cryp *cryp; +bool enc = !!(mode &AES_FLAGS_ENCRYPT ); cryp =mtk_aes_find_dev (ctx);if (!cryp)return -ENODEV ; +/* Compute text length. */ + gctx->textlen = req->cryptlen - (enc ?0 : gctx->authsize); +/* Empty messages are not supported yet */ if (!gctx->textlen && !req->assoclen)return -EINVAL ; rctx->mode =AES_FLAGS_GCM | mode; -return mtk_aes_handle_queue (cryp, !!(mode &AES_FLAGS_ENCRYPT ), - &req->base); +return mtk_aes_handle_queue (cryp, enc, &req->base); }/*
Signature · 1 line
2.17.1
PATCH 3/5 crypto: mediatek: only treat EBUSY as transient if backlog
In reply to Vic WuFrom: Ryder Lee <[email protected]>
The driver was treating -EBUSY as indication of queueing to backlog without checking that backlog is enabled for the request.
Fix it by checking request flags.
--- drivers/crypto/mediatek/mtk-sha.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/mediatek/mtk-sha.c +3 -1
@@ -781,7 +781,9 @@ static int mtk_sha_finup(struct ahash_request *req) ctx->flags |=SHA_FLAGS_FINUP ; err1 =mtk_sha_update (req); -if (err1 == -EINPROGRESS || err1 == -EBUSY ) +if (err1 == -EINPROGRESS || + (err1 == -EBUSY && (ahash_request_flags (req) & +CRYPTO_TFM_REQ_MAY_BACKLOG )))return err1;/* * final() has to be always called to cleanup resources
Signature · 1 line
2.17.1
PATCH 4/5 crypto: mediatek: add support to OFB/CFB mode
In reply to Vic WuFrom: Ryder Lee <[email protected]>
This patch adds support to OFB/CFB mode.
--- drivers/crypto/mediatek/mtk-aes.c | 85 ++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 7 deletions(-)
drivers/crypto/mediatek/mtk-aes.c +78 -7
@@ -25,7 +25,7 @@#define AES_CT_CTRL_HDR cpu_to_le32(0x00220000) -/* AES-CBC/ECB/CTR command token */ +/* AES-CBC/ECB/CTR/OFB/CFB command token */ #define AES_CMD0 cpu_to_le32(0x05000000)#define AES_CMD1 cpu_to_le32(0x2d060000)#define AES_CMD2 cpu_to_le32(0xe4a63806)
@@ -52,6 +52,8 @@/* AES transform information word 1 fields */ #define AES_TFM_ECB cpu_to_le32(0x0 << 0)#define AES_TFM_CBC cpu_to_le32(0x1 << 0) +#define AES_TFM_OFB cpu_to_le32(0x4 << 0) +#define AES_TFM_CFB128 cpu_to_le32(0x5 << 0)#define AES_TFM_CTR_INIT cpu_to_le32(0x2 << 0)/* init counter to 1 */ #define AES_TFM_CTR_LOAD cpu_to_le32(0x6 << 0)/* load/reuse counter */ #define AES_TFM_3IV cpu_to_le32(0x7 << 5)/* using IV 0-2 */
@@ -60,13 +62,15 @@#define AES_TFM_ENC_HASH cpu_to_le32(0x1 << 17)/* AES flags */ -#define AES_FLAGS_CIPHER_MSK GENMASK(2, 0) +#define AES_FLAGS_CIPHER_MSK GENMASK(4, 0)#define AES_FLAGS_ECB BIT(0)#define AES_FLAGS_CBC BIT(1)#define AES_FLAGS_CTR BIT(2) -#define AES_FLAGS_GCM BIT(3) -#define AES_FLAGS_ENCRYPT BIT(4) -#define AES_FLAGS_BUSY BIT(5) +#define AES_FLAGS_OFB BIT(3) +#define AES_FLAGS_CFB128 BIT(4) +#define AES_FLAGS_GCM BIT(5) +#define AES_FLAGS_ENCRYPT BIT(6) +#define AES_FLAGS_BUSY BIT(7)#define AES_AUTH_TAG_ERR cpu_to_le32(BIT(26))
@@ -412,7 +416,7 @@ exit:return mtk_aes_complete (cryp, aes, -EINVAL ); } -/* Initialize transform information of CBC/ECB/CTR mode */ +/* Initialize transform information of CBC/ECB/CTR/OFB/CFB mode */ static void mtk_aes_info_init (struct mtk_cryp *cryp,struct mtk_aes_rec *aes,size_t len) {
@@ -441,7 +445,12 @@ static void mtk_aes_info_init(struct mtk_cryp *cryp, struct mtk_aes_rec *aes,case AES_FLAGS_CTR : info->tfm[1 ] =AES_TFM_CTR_LOAD ; goto ctr; - +case AES_FLAGS_OFB : + info->tfm[1 ] =AES_TFM_OFB ; +break ; +case AES_FLAGS_CFB128 : + info->tfm[1 ] =AES_TFM_CFB128 ; +break ;default :/* Should not happen... */ return ;
@@ -704,6 +713,26 @@ static int mtk_aes_ctr_decrypt(struct ablkcipher_request *req)return mtk_aes_crypt (req,AES_FLAGS_CTR ); } +static int mtk_aes_ofb_encrypt (struct ablkcipher_request *req) +{ +return mtk_aes_crypt (req,AES_FLAGS_ENCRYPT |AES_FLAGS_OFB ); +} + +static int mtk_aes_ofb_decrypt (struct ablkcipher_request *req) +{ +return mtk_aes_crypt (req,AES_FLAGS_OFB ); +} + +static int mtk_aes_cfb_encrypt (struct ablkcipher_request *req) +{ +return mtk_aes_crypt (req,AES_FLAGS_ENCRYPT |AES_FLAGS_CFB128 ); +} + +static int mtk_aes_cfb_decrypt (struct ablkcipher_request *req) +{ +return mtk_aes_crypt (req,AES_FLAGS_CFB128 ); +} +static int mtk_aes_cra_init (struct crypto_tfm *tfm) {struct mtk_aes_ctx *ctx =crypto_tfm_ctx (tfm);
@@ -785,6 +814,48 @@ static struct crypto_alg aes_algs[] = { .decrypt = mtk_aes_ctr_decrypt, } }, +{ + .cra_name = "ofb(aes)", + .cra_driver_name = "ofb-aes-mtk", + .cra_priority = 400, + .cra_flags =CRYPTO_ALG_TYPE_ABLKCIPHER | + CRYPTO_ALG_ASYNC, + .cra_init = mtk_aes_cra_init, + .cra_blocksize = 1, + .cra_ctxsize = sizeof(struct mtk_aes_ctx), + .cra_alignmask = 0xf, + .cra_type = &crypto_ablkcipher_type, + .cra_module = THIS_MODULE, + .cra_u.ablkcipher = { + .min_keysize = AES_MIN_KEY_SIZE, + .max_keysize = AES_MAX_KEY_SIZE, + .ivsize = AES_BLOCK_SIZE, + .setkey = mtk_aes_setkey, + .encrypt = mtk_aes_ofb_encrypt, + .decrypt = mtk_aes_ofb_decrypt, + } +}, +{ + .cra_name = "cfb(aes)", + .cra_driver_name = "cfb-aes-mtk", + .cra_priority = 400, + .cra_flags =CRYPTO_ALG_TYPE_ABLKCIPHER | + CRYPTO_ALG_ASYNC, + .cra_init = mtk_aes_cra_init, + .cra_blocksize = 1, + .cra_ctxsize = sizeof(struct mtk_aes_ctx), + .cra_alignmask = 0xf, + .cra_type = &crypto_ablkcipher_type, + .cra_module = THIS_MODULE, + .cra_u.ablkcipher = { + .min_keysize = AES_MIN_KEY_SIZE, + .max_keysize = AES_MAX_KEY_SIZE, + .ivsize = AES_BLOCK_SIZE, + .setkey = mtk_aes_setkey, + .encrypt = mtk_aes_cfb_encrypt, + .decrypt = mtk_aes_cfb_decrypt, + } +}, }; static inline struct mtk_aes_gcm_ctx *
Signature · 1 line
2.17.1
PATCH 5/5 crypto: mediatek: fix incorrect crypto key setting
In reply to Vic WuRecord crypto key to context during setkey and set the key to transform state buffer in encrypt/decrypt process.
--- drivers/crypto/mediatek/mtk-aes.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/crypto/mediatek/mtk-aes.c +6 -5
@@ -107,6 +107,7 @@ struct mtk_aes_reqctx {struct mtk_aes_base_ctx {struct mtk_cryp *cryp;u32 keylen; +__le32 key[12 ];__le32 keymode;mtk_aes_fn start;
@@ -541,6 +542,8 @@ static int mtk_aes_handle_queue(struct mtk_cryp *cryp, u8 id, backlog->complete (backlog, -EINPROGRESS ); ctx =crypto_tfm_ctx (areq->tfm); +/* Write key into state buffer */ +memcpy (ctx->info.state, ctx->key,sizeof (ctx->key)); aes->areq = areq; aes->ctx = ctx;
@@ -660,7 +663,7 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm, } ctx->keylen =SIZE_IN_WORDS (keylen); -mtk_aes_write_state_le (ctx->info.state, (const u32 *)key, keylen); +mtk_aes_write_state_le (ctx->key, (const u32 *)key, keylen);return 0 ; }
@@ -1093,10 +1096,8 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,if (err) goto out; -/* Write key into state buffer */ -mtk_aes_write_state_le (ctx->info.state, (const u32 *)key, keylen); -/* Write key(H) into state buffer */ -mtk_aes_write_state_be (ctx->info.state + ctx->keylen, data->hash, +mtk_aes_write_state_le (ctx->key, (const u32 *)key, keylen); +mtk_aes_write_state_be (ctx->key + ctx->keylen, data->hash,AES_BLOCK_SIZE ); out:kzfree (data);
Signature · 1 line
2.17.1
Re: [PATCH 5/5] crypto: mediatek: fix incorrect crypto key setting
Quoted 4 lines · Vic Wu
Record crypto key to context during setkey and set the key to transform state buffer in encrypt/decrypt process.
Signed-off-by Vic Wu <[email protected]>
Thanks for the fix !
Quoted 47 lines
--- drivers/crypto/mediatek/mtk-aes.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)drivers/crypto/mediatek/mtk-aes.c +6
-5@@ -107,6 +107,7 @@ struct mtk_aes_reqctx {struct mtk_aes_base_ctx {struct mtk_cryp *cryp;u32 keylen; +__le32 key[12 ];__le32 keymode;mtk_aes_fn start;@@ -541,6 +542,8 @@ static int mtk_aes_handle_queue(struct mtk_cryp *cryp, u8 id, backlog->complete (backlog, -EINPROGRESS ); ctx =crypto_tfm_ctx (areq->tfm); +/* Write key into state buffer */ +memcpy (ctx->info.state, ctx->key,sizeof (ctx->key)); aes->areq = areq; aes->ctx = ctx;@@ -660,7 +663,7 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm, } ctx->keylen =SIZE_IN_WORDS (keylen); -mtk_aes_write_state_le (ctx->info.state, (const u32 *)key, keylen); +mtk_aes_write_state_le (ctx->key, (const u32 *)key, keylen);return 0 ; }@@ -1093,10 +1096,8 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,if (err) goto out; -/* Write key into state buffer */ -mtk_aes_write_state_le (ctx->info.state, (const u32 *)key, keylen); -/* Write key(H) into state buffer */ -mtk_aes_write_state_be (ctx->info.state + ctx->keylen, data->hash, +mtk_aes_write_state_le (ctx->key, (const u32 *)key, keylen); +mtk_aes_write_state_be (ctx->key + ctx->keylen, data->hash,AES_BLOCK_SIZE ); out:kzfree (data);
Herbert Xu
maintainerQuoted 5 lines · Vic Wu
From: Ryder Lee <[email protected]>
Move
mtk_aes_find_dev()to right functions as nobody uses the 'cryp' under current flows.
Quoted 7 lines
We can also avoid duplicate checks here and there in this way.
Signed-off-by Ryder Lee <[email protected]>Signed-off-by Vic Wu <[email protected]>--- drivers/crypto/mediatek/mtk-aes.c | 39 +++++++++++-------------------- 1 file changed, 14 insertions(+), 25 deletions(-)
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt