hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/crypto/rockchip/rk_crypto_skcipher_utils.c
....@@ -331,7 +331,6 @@
331331 struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
332332 struct rk_crypto_algt *algt = rk_cipher_get_algt(tfm);
333333 struct rk_alg_ctx *alg_ctx = rk_cipher_alg_ctx(rk_dev);
334
- unsigned long flags;
335334 int err = 0;
336335
337336 alg_ctx->left_bytes = req->cryptlen;
....@@ -345,10 +344,9 @@
345344
346345 CRYPTO_TRACE("total = %u", alg_ctx->total);
347346
348
- spin_lock_irqsave(&rk_dev->lock, flags);
349347 alg_ctx->ops.hw_init(rk_dev, algt->algo, algt->mode);
350348 err = rk_set_data_start(rk_dev);
351
- spin_unlock_irqrestore(&rk_dev->lock, flags);
349
+
352350 return err;
353351 }
354352
....@@ -443,7 +441,6 @@
443441 struct rk_crypto_algt *algt = rk_aead_get_algt(tfm);
444442 struct rk_alg_ctx *alg_ctx = rk_cipher_alg_ctx(rk_dev);
445443 unsigned int total = 0, authsize;
446
- unsigned long flags;
447444 int err = 0;
448445
449446 total = req->cryptlen + req->assoclen;
....@@ -464,30 +461,15 @@
464461 CRYPTO_TRACE("is_enc = %d, authsize = %u, cryptlen = %u, total = %u, assoclen = %u",
465462 ctx->is_enc, authsize, req->cryptlen, alg_ctx->total, alg_ctx->assoclen);
466463
467
- spin_lock_irqsave(&rk_dev->lock, flags);
468464 alg_ctx->ops.hw_init(rk_dev, algt->algo, algt->mode);
469465 err = rk_set_data_start(rk_dev);
470
- spin_unlock_irqrestore(&rk_dev->lock, flags);
466
+
471467 return err;
472468 }
473469
474470 int rk_aead_gcm_setauthsize(struct crypto_aead *tfm, unsigned int authsize)
475471 {
476
- /* Same as crypto_gcm_authsize() from crypto/gcm.c */
477
- switch (authsize) {
478
- case 4:
479
- case 8:
480
- case 12:
481
- case 13:
482
- case 14:
483
- case 15:
484
- case 16:
485
- break;
486
- default:
487
- return -EINVAL;
488
- }
489
-
490
- return 0;
472
+ return crypto_gcm_check_authsize(authsize);
491473 }
492474
493475 int rk_aead_handle_req(struct rk_crypto_dev *rk_dev, struct aead_request *req)