diff options
author | Christian Lamparter <chunkeey@gmail.com> | 2020-03-07 16:58:32 +0100 |
---|---|---|
committer | Christian Lamparter <chunkeey@gmail.com> | 2020-03-14 15:17:32 +0100 |
commit | b052b62efc3d49f61eb12d48b16851a48cfb928c (patch) | |
tree | 1a23d3e3707c5e52f42471cbe0bc173eed02ec2f /target/linux/apm821xx/patches-4.14/020-0006-crypto-crypto4xx-fix-dynamic_sa_ctl-s-sa_contents-de.patch | |
parent | 0a06fcf608ddf1f5db389decf266283392344784 (diff) | |
download | upstream-b052b62efc3d49f61eb12d48b16851a48cfb928c.tar.gz upstream-b052b62efc3d49f61eb12d48b16851a48cfb928c.tar.bz2 upstream-b052b62efc3d49f61eb12d48b16851a48cfb928c.zip |
apm821xx: 4.14: remove kernel config and patches
This patch removes the 4.14 kernel support from the apm821xx target.
The 4.19 kernel has been available and stable for a while and the 5.4
kernel support has been tested successfully on real hardware as well.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/020-0006-crypto-crypto4xx-fix-dynamic_sa_ctl-s-sa_contents-de.patch')
-rw-r--r-- | target/linux/apm821xx/patches-4.14/020-0006-crypto-crypto4xx-fix-dynamic_sa_ctl-s-sa_contents-de.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/target/linux/apm821xx/patches-4.14/020-0006-crypto-crypto4xx-fix-dynamic_sa_ctl-s-sa_contents-de.patch b/target/linux/apm821xx/patches-4.14/020-0006-crypto-crypto4xx-fix-dynamic_sa_ctl-s-sa_contents-de.patch deleted file mode 100644 index db57f7b3a8..0000000000 --- a/target/linux/apm821xx/patches-4.14/020-0006-crypto-crypto4xx-fix-dynamic_sa_ctl-s-sa_contents-de.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 453e3090b9c3f5da70b21648c2244e9821f0916d Mon Sep 17 00:00:00 2001 -From: Christian Lamparter <chunkeey@googlemail.com> -Date: Fri, 25 Aug 2017 15:47:19 +0200 -Subject: [PATCH 06/25] crypto: crypto4xx - fix dynamic_sa_ctl's sa_contents - declaration - -The driver had a union dynamic_sa_contents in place that -described the meaning of the bits in the sa_contents -variable. - -Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> -Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> ---- - drivers/crypto/amcc/crypto4xx_alg.c | 4 ++-- - drivers/crypto/amcc/crypto4xx_sa.c | 12 ++++++------ - drivers/crypto/amcc/crypto4xx_sa.h | 2 +- - 3 files changed, 9 insertions(+), 9 deletions(-) - ---- a/drivers/crypto/amcc/crypto4xx_alg.c -+++ b/drivers/crypto/amcc/crypto4xx_alg.c -@@ -150,7 +150,7 @@ static int crypto4xx_setkey_aes(struct c - SA_NOT_COPY_HDR); - crypto4xx_memcpy_le(ctx->sa_in + get_dynamic_sa_offset_key_field(ctx), - key, keylen); -- sa->sa_contents = SA_AES_CONTENTS | (keylen << 2); -+ sa->sa_contents.w = SA_AES_CONTENTS | (keylen << 2); - sa->sa_command_1.bf.key_len = keylen >> 3; - ctx->is_hash = 0; - ctx->direction = DIR_INBOUND; -@@ -220,7 +220,7 @@ static int crypto4xx_hash_alg_init(struc - SA_NOT_COPY_PAD, SA_NOT_COPY_PAYLOAD, - SA_NOT_COPY_HDR); - ctx->direction = DIR_INBOUND; -- sa->sa_contents = SA_HASH160_CONTENTS; -+ sa->sa_contents.w = SA_HASH160_CONTENTS; - sa_in = (struct dynamic_sa_hash160 *) ctx->sa_in; - /* Need to zero hash digest in SA */ - memset(sa_in->inner_digest, 0, sizeof(sa_in->inner_digest)); ---- a/drivers/crypto/amcc/crypto4xx_sa.c -+++ b/drivers/crypto/amcc/crypto4xx_sa.c -@@ -40,9 +40,9 @@ u32 get_dynamic_sa_offset_state_ptr_fiel - union dynamic_sa_contents cts; - - if (ctx->direction == DIR_INBOUND) -- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents; -+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents.w; - else -- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents; -+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents.w; - offset = cts.bf.key_size - + cts.bf.inner_size - + cts.bf.outer_size -@@ -66,9 +66,9 @@ u32 get_dynamic_sa_iv_size(struct crypto - union dynamic_sa_contents cts; - - if (ctx->direction == DIR_INBOUND) -- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents; -+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents.w; - else -- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents; -+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents.w; - return (cts.bf.iv0 + cts.bf.iv1 + cts.bf.iv2 + cts.bf.iv3) * 4; - } - -@@ -77,9 +77,9 @@ u32 get_dynamic_sa_offset_key_field(stru - union dynamic_sa_contents cts; - - if (ctx->direction == DIR_INBOUND) -- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents; -+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents.w; - else -- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents; -+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents.w; - - return sizeof(struct dynamic_sa_ctl); - } ---- a/drivers/crypto/amcc/crypto4xx_sa.h -+++ b/drivers/crypto/amcc/crypto4xx_sa.h -@@ -169,7 +169,7 @@ union sa_command_1 { - } __attribute__((packed)); - - struct dynamic_sa_ctl { -- u32 sa_contents; -+ union dynamic_sa_contents sa_contents; - union sa_command_0 sa_command_0; - union sa_command_1 sa_command_1; - } __attribute__((packed)); |