From b765f4be407ca407c8f446a0970aab8e7e93bffb Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 29 Apr 2019 13:01:53 +0200 Subject: kernel: bump 4.14 to 4.14.114 Refreshed all patches. Altered patches: - 150-bridge_allow_receiption_on_disabled_port.patch - 201-extra_optimization.patch Remove upstreamed: - 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- ...0-0017-crypto-crypto4xx-add-backlog-queue-support.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch') diff --git a/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch b/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch index 046dd9c257..4e644cf627 100644 --- a/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch +++ b/target/linux/apm821xx/patches-4.14/020-0017-crypto-crypto4xx-add-backlog-queue-support.patch @@ -56,9 +56,9 @@ Signed-off-by: Herbert Xu #include "crypto4xx_reg_def.h" #include "crypto4xx_core.h" #include "crypto4xx_sa.h" -@@ -573,8 +574,10 @@ static u32 crypto4xx_ablkcipher_done(str - dst->offset, dst->length, DMA_FROM_DEVICE); +@@ -582,8 +583,10 @@ static u32 crypto4xx_ablkcipher_done(str } + crypto4xx_ret_sg_desc(dev, pd_uinfo); - if (ablk_req->base.complete != NULL) - ablk_req->base.complete(&ablk_req->base, 0); @@ -69,7 +69,7 @@ Signed-off-by: Herbert Xu return 0; } -@@ -591,9 +594,10 @@ static u32 crypto4xx_ahash_done(struct c +@@ -600,9 +603,10 @@ static u32 crypto4xx_ahash_done(struct c crypto4xx_copy_digest_to_dst(pd_uinfo, crypto_tfm_ctx(ahash_req->base.tfm)); crypto4xx_ret_sg_desc(dev, pd_uinfo); @@ -83,7 +83,7 @@ Signed-off-by: Herbert Xu return 0; } -@@ -704,6 +708,7 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -713,6 +717,7 @@ u32 crypto4xx_build_pd(struct crypto_asy struct pd_uinfo *pd_uinfo = NULL; unsigned int nbytes = datalen, idx; u32 gd_idx = 0; @@ -91,7 +91,7 @@ Signed-off-by: Herbert Xu /* figure how many gd is needed */ num_gd = sg_nents_for_len(src, datalen); -@@ -734,6 +739,31 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -743,6 +748,31 @@ u32 crypto4xx_build_pd(struct crypto_asy * already got must be return the original place. */ spin_lock_irqsave(&dev->core_dev->lock, flags); @@ -123,7 +123,7 @@ Signed-off-by: Herbert Xu if (num_gd) { fst_gd = crypto4xx_get_n_gd(dev, num_gd); if (fst_gd == ERING_WAS_FULL) { -@@ -888,11 +918,12 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -897,11 +927,12 @@ u32 crypto4xx_build_pd(struct crypto_asy sa->sa_command_1.bf.hash_crypto_offset = 0; pd->pd_ctl.w = ctx->pd_ctl; pd->pd_ctl_len.w = 0x00400000 | datalen; @@ -138,7 +138,7 @@ Signed-off-by: Herbert Xu } /** -@@ -997,7 +1028,7 @@ static void crypto4xx_bh_tasklet_cb(unsi +@@ -1006,7 +1037,7 @@ static void crypto4xx_bh_tasklet_cb(unsi tail = core_dev->dev->pdr_tail; pd_uinfo = &core_dev->dev->pdr_uinfo[tail]; pd = &core_dev->dev->pdr[tail]; -- cgit v1.2.3