kernel: bump 4.14 to 4.14.159

[openwrt/staging/rmilecki.git] / 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 046dd9c257cf892cc20c03cc5911db7330e8d670..cc88baecb423ed5b686927ede399c4839fc2880b 100644 (file)
--- 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 <herbert@gondor.apana.org.au>
  #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);
+@@ -578,8 +579,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 <herbert@gondor.apana.org.au>
  
        return 0;
  }
-@@ -591,9 +594,10 @@ static u32 crypto4xx_ahash_done(struct c
+@@ -596,9 +599,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 <herbert@gondor.apana.org.au>
  
        return 0;
  }
-@@ -704,6 +708,7 @@ u32 crypto4xx_build_pd(struct crypto_asy
+@@ -709,6 +713,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 <herbert@gondor.apana.org.au>
  
        /* 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
+@@ -739,6 +744,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 <herbert@gondor.apana.org.au>
        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
+@@ -893,11 +923,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 <herbert@gondor.apana.org.au>
  }
  
  /**
-@@ -997,7 +1028,7 @@ static void crypto4xx_bh_tasklet_cb(unsi
+@@ -1002,7 +1033,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];