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 --- ...pto-crypto4xx-overhaul-crypto4xx_build_pd.patch | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch') diff --git a/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch b/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch index 7b739c68cd..023f63638f 100644 --- a/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch +++ b/target/linux/apm821xx/patches-4.14/020-0019-crypto-crypto4xx-overhaul-crypto4xx_build_pd.patch @@ -82,7 +82,7 @@ Signed-off-by: Herbert Xu } /** -@@ -153,11 +155,6 @@ static int crypto4xx_setkey_aes(struct c +@@ -154,11 +156,6 @@ static int crypto4xx_setkey_aes(struct c key, keylen); sa->sa_contents.w = SA_AES_CONTENTS | (keylen << 2); sa->sa_command_1.bf.key_len = keylen >> 3; @@ -94,7 +94,7 @@ Signed-off-by: Herbert Xu memcpy(ctx->sa_out, ctx->sa_in, ctx->sa_len * 4); sa = ctx->sa_out; -@@ -206,7 +203,7 @@ int crypto4xx_setkey_rfc3686(struct cryp +@@ -207,7 +204,7 @@ int crypto4xx_setkey_rfc3686(struct cryp if (rc) return rc; @@ -103,7 +103,7 @@ Signed-off-by: Herbert Xu key + keylen - CTR_RFC3686_NONCE_SIZE, CTR_RFC3686_NONCE_SIZE); return 0; -@@ -215,27 +212,29 @@ int crypto4xx_setkey_rfc3686(struct cryp +@@ -216,27 +213,29 @@ int crypto4xx_setkey_rfc3686(struct cryp int crypto4xx_rfc3686_encrypt(struct ablkcipher_request *req) { struct crypto4xx_ctx *ctx = crypto_tfm_ctx(req->base.tfm); @@ -145,7 +145,7 @@ Signed-off-by: Herbert Xu } /** -@@ -253,7 +252,6 @@ static int crypto4xx_hash_alg_init(struc +@@ -254,7 +253,6 @@ static int crypto4xx_hash_alg_init(struc int rc; ctx->dev = my_alg->dev; @@ -153,7 +153,7 @@ Signed-off-by: Herbert Xu /* Create SA */ if (ctx->sa_in_dma_addr || ctx->sa_out_dma_addr) -@@ -284,13 +282,9 @@ static int crypto4xx_hash_alg_init(struc +@@ -285,13 +283,9 @@ static int crypto4xx_hash_alg_init(struc SA_SEQ_MASK_OFF, SA_MC_ENABLE, SA_NOT_COPY_PAD, SA_NOT_COPY_PAYLOAD, SA_NOT_COPY_HDR); @@ -167,7 +167,7 @@ Signed-off-by: Herbert Xu return 0; } -@@ -306,23 +300,22 @@ int crypto4xx_hash_init(struct ahash_req +@@ -307,23 +301,22 @@ int crypto4xx_hash_init(struct ahash_req __crypto_ahash_cast(req->base.tfm)); sa->sa_command_0.bf.digest_len = ds >> 2; sa->sa_command_0.bf.load_hash_state = SA_LOAD_HASH_FROM_SA; @@ -199,7 +199,7 @@ Signed-off-by: Herbert Xu } int crypto4xx_hash_final(struct ahash_request *req) -@@ -332,14 +325,16 @@ int crypto4xx_hash_final(struct ahash_re +@@ -333,14 +326,16 @@ int crypto4xx_hash_final(struct ahash_re int crypto4xx_hash_digest(struct ahash_request *req) { @@ -285,7 +285,7 @@ Signed-off-by: Herbert Xu } static void crypto4xx_ret_sg_desc(struct crypto4xx_device *dev, -@@ -591,7 +583,7 @@ static u32 crypto4xx_ahash_done(struct c +@@ -600,7 +592,7 @@ static u32 crypto4xx_ahash_done(struct c ahash_req = ahash_request_cast(pd_uinfo->async_req); ctx = crypto_tfm_ctx(ahash_req->base.tfm); @@ -294,7 +294,7 @@ Signed-off-by: Herbert Xu crypto_tfm_ctx(ahash_req->base.tfm)); crypto4xx_ret_sg_desc(dev, pd_uinfo); -@@ -651,17 +643,17 @@ static u32 get_next_sd(u32 current) +@@ -660,17 +652,17 @@ static u32 get_next_sd(u32 current) return 0; } @@ -317,7 +317,7 @@ Signed-off-by: Herbert Xu struct ce_gd *gd; struct ce_pd *pd; u32 num_gd, num_sd; -@@ -669,8 +661,9 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -678,8 +670,9 @@ u32 crypto4xx_build_pd(struct crypto_asy u32 fst_sd = 0xffffffff; u32 pd_entry; unsigned long flags; @@ -329,7 +329,7 @@ Signed-off-by: Herbert Xu u32 gd_idx = 0; bool is_busy; -@@ -684,7 +677,7 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -693,7 +686,7 @@ u32 crypto4xx_build_pd(struct crypto_asy num_gd = 0; /* figure how many sd is needed */ @@ -338,7 +338,7 @@ Signed-off-by: Herbert Xu num_sd = 0; } else { if (datalen > PPC4XX_SD_BUFFER_SIZE) { -@@ -755,37 +748,27 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -764,37 +757,27 @@ u32 crypto4xx_build_pd(struct crypto_asy } spin_unlock_irqrestore(&dev->core_dev->lock, flags); @@ -389,7 +389,7 @@ Signed-off-by: Herbert Xu /* get first gd we are going to use */ gd_idx = fst_gd; pd_uinfo->first_gd = fst_gd; -@@ -794,27 +777,30 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -803,27 +786,30 @@ u32 crypto4xx_build_pd(struct crypto_asy pd->src = gd_dma; /* enable gather */ sa->sa_command_0.bf.gather = 1; @@ -430,7 +430,7 @@ Signed-off-by: Herbert Xu /* * Disable gather in sa command */ -@@ -825,25 +811,24 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -834,25 +820,24 @@ u32 crypto4xx_build_pd(struct crypto_asy pd_uinfo->first_gd = 0xffffffff; pd_uinfo->num_gd = 0; } @@ -463,7 +463,7 @@ Signed-off-by: Herbert Xu u32 sd_idx = fst_sd; nbytes = datalen; sa->sa_command_0.bf.scatter = 1; -@@ -857,7 +842,6 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -866,7 +851,6 @@ u32 crypto4xx_build_pd(struct crypto_asy sd->ctl.done = 0; sd->ctl.rdy = 1; /* sd->ptr should be setup by sd_init routine*/ @@ -471,7 +471,7 @@ Signed-off-by: Herbert Xu if (nbytes >= PPC4XX_SD_BUFFER_SIZE) nbytes -= PPC4XX_SD_BUFFER_SIZE; else -@@ -868,19 +852,23 @@ u32 crypto4xx_build_pd(struct crypto_asy +@@ -877,19 +861,23 @@ u32 crypto4xx_build_pd(struct crypto_asy /* setup scatter descriptor */ sd->ctl.done = 0; sd->ctl.rdy = 1; -- cgit v1.2.3