mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
01d8e41c16
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.51 Removed upstreamed: generic/backport-6.6/200-regmap-maple-work-around-false-positive-warning.patch generic/backport-6.6/822-v6.11-0012-nvmem-Fix-return-type-of-devm_nvmem_device_get-in-ke.patch bcm27xx/patches-6.6/950-1018-drivers-mmc-apply-SD-quirks-earlier-during-probe.patch Manually rebased: bcm27xx/patches-6.6/950-0993-drivers-mmc-cqhci-clear-CQHCI_CTL-if-halt-fails.patch ramips/patches-6.6/311-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch[4] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=e42ea96d6d36a16526cb82b8aa2e5422814c3250 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=3d1baf322a3a69b38b6b2d511cfe0d611d1b5462 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.51&id=115a755bb38db5a1175be44e6a9a93a0a8233885 4. Adapted the changes from Hauke Mehrtens' modification in PR#16366 to 5.15.167 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16370 Signed-off-by: Robert Marko <robimarko@gmail.com>
126 lines
4.0 KiB
Diff
126 lines
4.0 KiB
Diff
From 922b213ad22f93fb2788ce119084622ab3d25bf8 Mon Sep 17 00:00:00 2001
|
|
From: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Date: Thu, 30 Nov 2023 18:12:55 +0800
|
|
Subject: [PATCH 012/116] crypto: starfive - Remove cfb and ofb
|
|
|
|
Remove the unused CFB/OFB implementation.
|
|
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/starfive/jh7110-aes.c | 71 +--------------------------
|
|
drivers/crypto/starfive/jh7110-cryp.h | 2 -
|
|
2 files changed, 1 insertion(+), 72 deletions(-)
|
|
|
|
--- a/drivers/crypto/starfive/jh7110-aes.c
|
|
+++ b/drivers/crypto/starfive/jh7110-aes.c
|
|
@@ -262,12 +262,7 @@ static int starfive_aes_hw_init(struct s
|
|
rctx->csr.aes.mode = hw_mode;
|
|
rctx->csr.aes.cmode = !is_encrypt(cryp);
|
|
rctx->csr.aes.ie = 1;
|
|
-
|
|
- if (hw_mode == STARFIVE_AES_MODE_CFB ||
|
|
- hw_mode == STARFIVE_AES_MODE_OFB)
|
|
- rctx->csr.aes.stmode = STARFIVE_AES_MODE_XFB_128;
|
|
- else
|
|
- rctx->csr.aes.stmode = STARFIVE_AES_MODE_XFB_1;
|
|
+ rctx->csr.aes.stmode = STARFIVE_AES_MODE_XFB_1;
|
|
|
|
if (cryp->side_chan) {
|
|
rctx->csr.aes.delay_aes = 1;
|
|
@@ -294,8 +289,6 @@ static int starfive_aes_hw_init(struct s
|
|
starfive_aes_ccm_init(ctx);
|
|
starfive_aes_aead_hw_start(ctx, hw_mode);
|
|
break;
|
|
- case STARFIVE_AES_MODE_OFB:
|
|
- case STARFIVE_AES_MODE_CFB:
|
|
case STARFIVE_AES_MODE_CBC:
|
|
case STARFIVE_AES_MODE_CTR:
|
|
starfive_aes_write_iv(ctx, (void *)cryp->req.sreq->iv);
|
|
@@ -785,26 +778,6 @@ static int starfive_aes_cbc_decrypt(stru
|
|
return starfive_aes_crypt(req, STARFIVE_AES_MODE_CBC);
|
|
}
|
|
|
|
-static int starfive_aes_cfb_encrypt(struct skcipher_request *req)
|
|
-{
|
|
- return starfive_aes_crypt(req, STARFIVE_AES_MODE_CFB | FLG_ENCRYPT);
|
|
-}
|
|
-
|
|
-static int starfive_aes_cfb_decrypt(struct skcipher_request *req)
|
|
-{
|
|
- return starfive_aes_crypt(req, STARFIVE_AES_MODE_CFB);
|
|
-}
|
|
-
|
|
-static int starfive_aes_ofb_encrypt(struct skcipher_request *req)
|
|
-{
|
|
- return starfive_aes_crypt(req, STARFIVE_AES_MODE_OFB | FLG_ENCRYPT);
|
|
-}
|
|
-
|
|
-static int starfive_aes_ofb_decrypt(struct skcipher_request *req)
|
|
-{
|
|
- return starfive_aes_crypt(req, STARFIVE_AES_MODE_OFB);
|
|
-}
|
|
-
|
|
static int starfive_aes_ctr_encrypt(struct skcipher_request *req)
|
|
{
|
|
return starfive_aes_crypt(req, STARFIVE_AES_MODE_CTR | FLG_ENCRYPT);
|
|
@@ -903,48 +876,6 @@ static struct skcipher_engine_alg skciph
|
|
.cra_priority = 200,
|
|
.cra_flags = CRYPTO_ALG_ASYNC,
|
|
.cra_blocksize = 1,
|
|
- .cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 0xf,
|
|
- .cra_module = THIS_MODULE,
|
|
- },
|
|
- .op = {
|
|
- .do_one_request = starfive_aes_do_one_req,
|
|
- },
|
|
-}, {
|
|
- .base.init = starfive_aes_init_tfm,
|
|
- .base.setkey = starfive_aes_setkey,
|
|
- .base.encrypt = starfive_aes_cfb_encrypt,
|
|
- .base.decrypt = starfive_aes_cfb_decrypt,
|
|
- .base.min_keysize = AES_MIN_KEY_SIZE,
|
|
- .base.max_keysize = AES_MAX_KEY_SIZE,
|
|
- .base.ivsize = AES_BLOCK_SIZE,
|
|
- .base.base = {
|
|
- .cra_name = "cfb(aes)",
|
|
- .cra_driver_name = "starfive-cfb-aes",
|
|
- .cra_priority = 200,
|
|
- .cra_flags = CRYPTO_ALG_ASYNC,
|
|
- .cra_blocksize = 1,
|
|
- .cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
- .cra_alignmask = 0xf,
|
|
- .cra_module = THIS_MODULE,
|
|
- },
|
|
- .op = {
|
|
- .do_one_request = starfive_aes_do_one_req,
|
|
- },
|
|
-}, {
|
|
- .base.init = starfive_aes_init_tfm,
|
|
- .base.setkey = starfive_aes_setkey,
|
|
- .base.encrypt = starfive_aes_ofb_encrypt,
|
|
- .base.decrypt = starfive_aes_ofb_decrypt,
|
|
- .base.min_keysize = AES_MIN_KEY_SIZE,
|
|
- .base.max_keysize = AES_MAX_KEY_SIZE,
|
|
- .base.ivsize = AES_BLOCK_SIZE,
|
|
- .base.base = {
|
|
- .cra_name = "ofb(aes)",
|
|
- .cra_driver_name = "starfive-ofb-aes",
|
|
- .cra_priority = 200,
|
|
- .cra_flags = CRYPTO_ALG_ASYNC,
|
|
- .cra_blocksize = 1,
|
|
.cra_ctxsize = sizeof(struct starfive_cryp_ctx),
|
|
.cra_alignmask = 0xf,
|
|
.cra_module = THIS_MODULE,
|
|
--- a/drivers/crypto/starfive/jh7110-cryp.h
|
|
+++ b/drivers/crypto/starfive/jh7110-cryp.h
|
|
@@ -51,8 +51,6 @@ union starfive_aes_csr {
|
|
u32 ccm_start :1;
|
|
#define STARFIVE_AES_MODE_ECB 0x0
|
|
#define STARFIVE_AES_MODE_CBC 0x1
|
|
-#define STARFIVE_AES_MODE_CFB 0x2
|
|
-#define STARFIVE_AES_MODE_OFB 0x3
|
|
#define STARFIVE_AES_MODE_CTR 0x4
|
|
#define STARFIVE_AES_MODE_CCM 0x5
|
|
#define STARFIVE_AES_MODE_GCM 0x6
|