Skip to content

Commit 059b149

Browse files
ryderlee1110herbertx
ryderlee1110
authored and
herbertx
committed
crypto: mediatek - fix typo and indentation
Dummy patch to fix typo and indentation. Signed-off-by: Ryder Lee <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 0abc271 commit 059b149

File tree

3 files changed

+63
-69
lines changed

3 files changed

+63
-69
lines changed

‎drivers/crypto/mediatek/mtk-aes.c‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ static int mtk_aes_map(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)
314314
aes->dst.sg_len = dma_map_sg(cryp->dev, aes->dst.sg,
315315
aes->dst.nents, DMA_FROM_DEVICE);
316316
if (unlikely(!aes->dst.sg_len)) {
317-
dma_unmap_sg(cryp->dev, aes->src.sg,
318-
aes->src.nents, DMA_TO_DEVICE);
317+
dma_unmap_sg(cryp->dev, aes->src.sg, aes->src.nents,
318+
DMA_TO_DEVICE);
319319
goto sg_map_err;
320320
}
321321
}
@@ -484,7 +484,7 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm,
484484
const u8 *key, u32 keylen)
485485
{
486486
struct mtk_aes_base_ctx *ctx = crypto_ablkcipher_ctx(tfm);
487-
const u32 *key_tmp = (const u32 *)key;
487+
const u32 *aes_key = (const u32 *)key;
488488
u32 *key_state = ctx->tfm.state;
489489
int i;
490490

@@ -498,7 +498,7 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm,
498498
ctx->keylen = SIZE_IN_WORDS(keylen);
499499

500500
for (i = 0; i < ctx->keylen; i++)
501-
key_state[i] = cpu_to_le32(key_tmp[i]);
501+
key_state[i] = cpu_to_le32(aes_key[i]);
502502

503503
return 0;
504504
}
@@ -512,26 +512,26 @@ static int mtk_aes_crypt(struct ablkcipher_request *req, u64 mode)
512512
rctx = ablkcipher_request_ctx(req);
513513
rctx->mode = mode;
514514

515-
return mtk_aes_handle_queue(ctx->cryp,
516-
!(mode & AES_FLAGS_ENCRYPT), &req->base);
515+
return mtk_aes_handle_queue(ctx->cryp, !(mode & AES_FLAGS_ENCRYPT),
516+
&req->base);
517517
}
518518

519-
static int mtk_ecb_encrypt(struct ablkcipher_request *req)
519+
static int mtk_aes_ecb_encrypt(struct ablkcipher_request *req)
520520
{
521521
return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT | AES_FLAGS_ECB);
522522
}
523523

524-
static int mtk_ecb_decrypt(struct ablkcipher_request *req)
524+
static int mtk_aes_ecb_decrypt(struct ablkcipher_request *req)
525525
{
526526
return mtk_aes_crypt(req, AES_FLAGS_ECB);
527527
}
528528

529-
static int mtk_cbc_encrypt(struct ablkcipher_request *req)
529+
static int mtk_aes_cbc_encrypt(struct ablkcipher_request *req)
530530
{
531531
return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT | AES_FLAGS_CBC);
532532
}
533533

534-
static int mtk_cbc_decrypt(struct ablkcipher_request *req)
534+
static int mtk_aes_cbc_decrypt(struct ablkcipher_request *req)
535535
{
536536
return mtk_aes_crypt(req, AES_FLAGS_CBC);
537537
}
@@ -554,44 +554,44 @@ static int mtk_aes_cra_init(struct crypto_tfm *tfm)
554554

555555
static struct crypto_alg aes_algs[] = {
556556
{
557-
.cra_name = "cbc(aes)",
558-
.cra_driver_name = "cbc-aes-mtk",
559-
.cra_priority = 400,
560-
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
561-
CRYPTO_ALG_ASYNC,
562-
.cra_init = mtk_aes_cra_init,
563-
.cra_blocksize = AES_BLOCK_SIZE,
564-
.cra_ctxsize = sizeof(struct mtk_aes_ctx),
565-
.cra_alignmask = 15,
566-
.cra_type = &crypto_ablkcipher_type,
567-
.cra_module = THIS_MODULE,
568-
.cra_u.ablkcipher = {
569-
.min_keysize = AES_MIN_KEY_SIZE,
570-
.max_keysize = AES_MAX_KEY_SIZE,
571-
.setkey = mtk_aes_setkey,
572-
.encrypt = mtk_cbc_encrypt,
573-
.decrypt = mtk_cbc_decrypt,
574-
.ivsize = AES_BLOCK_SIZE,
557+
.cra_name = "cbc(aes)",
558+
.cra_driver_name = "cbc-aes-mtk",
559+
.cra_priority = 400,
560+
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
561+
CRYPTO_ALG_ASYNC,
562+
.cra_init = mtk_aes_cra_init,
563+
.cra_blocksize = AES_BLOCK_SIZE,
564+
.cra_ctxsize = sizeof(struct mtk_aes_ctx),
565+
.cra_alignmask = 0xf,
566+
.cra_type = &crypto_ablkcipher_type,
567+
.cra_module = THIS_MODULE,
568+
.cra_u.ablkcipher = {
569+
.min_keysize = AES_MIN_KEY_SIZE,
570+
.max_keysize = AES_MAX_KEY_SIZE,
571+
.setkey = mtk_aes_setkey,
572+
.encrypt = mtk_aes_cbc_encrypt,
573+
.decrypt = mtk_aes_cbc_decrypt,
574+
.ivsize = AES_BLOCK_SIZE,
575575
}
576576
},
577577
{
578-
.cra_name = "ecb(aes)",
579-
.cra_driver_name = "ecb-aes-mtk",
580-
.cra_priority = 400,
581-
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
582-
CRYPTO_ALG_ASYNC,
583-
.cra_init = mtk_aes_cra_init,
584-
.cra_blocksize = AES_BLOCK_SIZE,
585-
.cra_ctxsize = sizeof(struct mtk_aes_ctx),
586-
.cra_alignmask = 15,
587-
.cra_type = &crypto_ablkcipher_type,
588-
.cra_module = THIS_MODULE,
589-
.cra_u.ablkcipher = {
590-
.min_keysize = AES_MIN_KEY_SIZE,
591-
.max_keysize = AES_MAX_KEY_SIZE,
592-
.setkey = mtk_aes_setkey,
593-
.encrypt = mtk_ecb_encrypt,
594-
.decrypt = mtk_ecb_decrypt,
578+
.cra_name = "ecb(aes)",
579+
.cra_driver_name = "ecb-aes-mtk",
580+
.cra_priority = 400,
581+
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
582+
CRYPTO_ALG_ASYNC,
583+
.cra_init = mtk_aes_cra_init,
584+
.cra_blocksize = AES_BLOCK_SIZE,
585+
.cra_ctxsize = sizeof(struct mtk_aes_ctx),
586+
.cra_alignmask = 0xf,
587+
.cra_type = &crypto_ablkcipher_type,
588+
.cra_module = THIS_MODULE,
589+
.cra_u.ablkcipher = {
590+
.min_keysize = AES_MIN_KEY_SIZE,
591+
.max_keysize = AES_MAX_KEY_SIZE,
592+
.setkey = mtk_aes_setkey,
593+
.encrypt = mtk_aes_ecb_encrypt,
594+
.decrypt = mtk_aes_ecb_decrypt,
595595
}
596596
},
597597
};

‎drivers/crypto/mediatek/mtk-platform.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ typedef int (*mtk_aes_fn)(struct mtk_cryp *cryp, struct mtk_aes_rec *aes);
124124
/**
125125
* struct mtk_aes_rec - AES operation record
126126
* @queue: crypto request queue
127-
* @req: pointer to async request
127+
* @areq: pointer to async request
128128
* @task: the tasklet is use in AES interrupt
129129
* @ctx: pointer to current context
130130
* @src: the structure that holds source sg list info

‎drivers/crypto/mediatek/mtk-sha.c‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@ static void mtk_sha_info_init(struct mtk_sha_reqctx *ctx)
317317
* Update input data length field of transform information and
318318
* map it to DMA region.
319319
*/
320-
static int mtk_sha_info_map(struct mtk_cryp *cryp,
321-
struct mtk_sha_rec *sha,
322-
size_t len)
320+
static int mtk_sha_info_update(struct mtk_cryp *cryp,
321+
struct mtk_sha_rec *sha,
322+
size_t len)
323323
{
324324
struct mtk_sha_reqctx *ctx = ahash_request_ctx(sha->req);
325325
struct mtk_sha_info *info = &ctx->info;
@@ -338,7 +338,7 @@ static int mtk_sha_info_map(struct mtk_cryp *cryp,
338338
ctx->digcnt += len;
339339

340340
ctx->ct_dma = dma_map_single(cryp->dev, info, sizeof(*info),
341-
DMA_BIDIRECTIONAL);
341+
DMA_BIDIRECTIONAL);
342342
if (unlikely(dma_mapping_error(cryp->dev, ctx->ct_dma))) {
343343
dev_err(cryp->dev, "dma %zu bytes error\n", sizeof(*info));
344344
return -EINVAL;
@@ -430,20 +430,15 @@ static int mtk_sha_xmit(struct mtk_cryp *cryp, struct mtk_sha_rec *sha,
430430
struct mtk_desc *res = ring->res_base + ring->res_pos;
431431
int err;
432432

433-
err = mtk_sha_info_map(cryp, sha, len);
433+
err = mtk_sha_info_update(cryp, sha, len);
434434
if (err)
435435
return err;
436436

437437
/* Fill in the command/result descriptors */
438-
res->hdr = MTK_DESC_FIRST |
439-
MTK_DESC_LAST |
440-
MTK_DESC_BUF_LEN(len);
441-
438+
res->hdr = MTK_DESC_FIRST | MTK_DESC_LAST | MTK_DESC_BUF_LEN(len);
442439
res->buf = cpu_to_le32(cryp->tmp_dma);
443440

444-
cmd->hdr = MTK_DESC_FIRST |
445-
MTK_DESC_LAST |
446-
MTK_DESC_BUF_LEN(len) |
441+
cmd->hdr = MTK_DESC_FIRST | MTK_DESC_LAST | MTK_DESC_BUF_LEN(len) |
447442
MTK_DESC_CT_LEN(ctx->ct_size);
448443

449444
cmd->buf = cpu_to_le32(addr);
@@ -477,16 +472,15 @@ static int mtk_sha_xmit2(struct mtk_cryp *cryp,
477472
struct mtk_desc *res = ring->res_base + ring->res_pos;
478473
int err;
479474

480-
err = mtk_sha_info_map(cryp, sha, len1 + len2);
475+
err = mtk_sha_info_update(cryp, sha, len1 + len2);
481476
if (err)
482477
return err;
483478

484479
/* Fill in the command/result descriptors */
485480
res->hdr = MTK_DESC_BUF_LEN(len1) | MTK_DESC_FIRST;
486481
res->buf = cpu_to_le32(cryp->tmp_dma);
487482

488-
cmd->hdr = MTK_DESC_BUF_LEN(len1) |
489-
MTK_DESC_FIRST |
483+
cmd->hdr = MTK_DESC_BUF_LEN(len1) | MTK_DESC_FIRST |
490484
MTK_DESC_CT_LEN(ctx->ct_size);
491485
cmd->buf = cpu_to_le32(sg_dma_address(ctx->sg));
492486
cmd->ct = cpu_to_le32(ctx->ct_dma);
@@ -530,7 +524,7 @@ static int mtk_sha_dma_map(struct mtk_cryp *cryp,
530524
size_t count)
531525
{
532526
ctx->dma_addr = dma_map_single(cryp->dev, ctx->buffer,
533-
SHA_BUF_SIZE, DMA_TO_DEVICE);
527+
SHA_BUF_SIZE, DMA_TO_DEVICE);
534528
if (unlikely(dma_mapping_error(cryp->dev, ctx->dma_addr))) {
535529
dev_err(cryp->dev, "dma map error\n");
536530
return -EINVAL;
@@ -619,7 +613,7 @@ static int mtk_sha_update_start(struct mtk_cryp *cryp,
619613
mtk_sha_fill_padding(ctx, len);
620614

621615
ctx->dma_addr = dma_map_single(cryp->dev, ctx->buffer,
622-
SHA_BUF_SIZE, DMA_TO_DEVICE);
616+
SHA_BUF_SIZE, DMA_TO_DEVICE);
623617
if (unlikely(dma_mapping_error(cryp->dev, ctx->dma_addr))) {
624618
dev_err(cryp->dev, "dma map bytes error\n");
625619
return -EINVAL;
@@ -658,8 +652,7 @@ static int mtk_sha_update_start(struct mtk_cryp *cryp,
658652
static int mtk_sha_final_req(struct mtk_cryp *cryp,
659653
struct mtk_sha_rec *sha)
660654
{
661-
struct ahash_request *req = sha->req;
662-
struct mtk_sha_reqctx *ctx = ahash_request_ctx(req);
655+
struct mtk_sha_reqctx *ctx = ahash_request_ctx(sha->req);
663656
size_t count;
664657

665658
mtk_sha_fill_padding(ctx, 0);
@@ -690,7 +683,8 @@ static int mtk_sha_finish(struct ahash_request *req)
690683
}
691684

692685
static void mtk_sha_finish_req(struct mtk_cryp *cryp,
693-
struct mtk_sha_rec *sha, int err)
686+
struct mtk_sha_rec *sha,
687+
int err)
694688
{
695689
if (likely(!err && (SHA_FLAGS_FINAL & sha->flags)))
696690
err = mtk_sha_finish(sha->req);
@@ -850,8 +844,8 @@ static int mtk_sha_digest(struct ahash_request *req)
850844
return mtk_sha_init(req) ?: mtk_sha_finup(req);
851845
}
852846

853-
static int mtk_sha_setkey(struct crypto_ahash *tfm,
854-
const unsigned char *key, u32 keylen)
847+
static int mtk_sha_setkey(struct crypto_ahash *tfm, const u8 *key,
848+
u32 keylen)
855849
{
856850
struct mtk_sha_ctx *tctx = crypto_ahash_ctx(tfm);
857851
struct mtk_sha_hmac_ctx *bctx = tctx->base;
@@ -863,7 +857,7 @@ static int mtk_sha_setkey(struct crypto_ahash *tfm,
863857

864858
shash->tfm = bctx->shash;
865859
shash->flags = crypto_shash_get_flags(bctx->shash) &
866-
CRYPTO_TFM_REQ_MAY_SLEEP;
860+
CRYPTO_TFM_REQ_MAY_SLEEP;
867861

868862
if (keylen > bs) {
869863
err = crypto_shash_digest(shash, key, keylen, bctx->ipad);

0 commit comments

Comments
 (0)