X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flayerscape%2Fpatches-4.14%2F820-sec-support-layerscape.patch;fp=target%2Flinux%2Flayerscape%2Fpatches-4.14%2F820-sec-support-layerscape.patch;h=ff0fe8daa4b820a08e61df64a15e4655b020ded8;hb=af6c86dbe56e7890080307b2af8c80fddde8b6a5;hp=d1e75952a0e40ea53acf9a0db1ef47991ab6a4f0;hpb=4bc0224149bfa09ea15b040a6bddd1c99b26f0c2;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch b/target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch
index d1e75952a0..ff0fe8daa4 100644
--- a/target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch
@@ -442,7 +442,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  static int test_cipher(struct crypto_cipher *tfm, int enc,
  		       const struct cipher_testvec *template,
  		       unsigned int tcount)
-@@ -3518,6 +3753,15 @@ static const struct alg_test_desc alg_te
+@@ -3524,6 +3759,15 @@ static const struct alg_test_desc alg_te
  			.hash = __VECS(tgr192_tv_template)
  		}
  	}, {
@@ -1828,7 +1828,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv))
  		append_load_as_imm(desc, req->iv, ivsize,
  				   LDST_CLASS_1_CCB |
-@@ -3203,9 +3247,11 @@ struct caam_crypto_alg {
+@@ -3204,9 +3248,11 @@ struct caam_crypto_alg {
  	struct caam_alg_entry caam;
  };
  
@@ -1841,7 +1841,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  
  	ctx->jrdev = caam_jr_alloc();
  	if (IS_ERR(ctx->jrdev)) {
-@@ -3213,10 +3259,16 @@ static int caam_init_common(struct caam_
+@@ -3214,10 +3260,16 @@ static int caam_init_common(struct caam_
  		return PTR_ERR(ctx->jrdev);
  	}
  
@@ -1859,7 +1859,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  	if (dma_mapping_error(ctx->jrdev, dma_addr)) {
  		dev_err(ctx->jrdev, "unable to map key, shared descriptors\n");
  		caam_jr_free(ctx->jrdev);
-@@ -3244,7 +3296,7 @@ static int caam_cra_init(struct crypto_t
+@@ -3245,7 +3297,7 @@ static int caam_cra_init(struct crypto_t
  		 container_of(alg, struct caam_crypto_alg, crypto_alg);
  	struct caam_ctx *ctx = crypto_tfm_ctx(tfm);
  
@@ -1868,7 +1868,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  }
  
  static int caam_aead_init(struct crypto_aead *tfm)
-@@ -3254,14 +3306,15 @@ static int caam_aead_init(struct crypto_
+@@ -3255,14 +3307,15 @@ static int caam_aead_init(struct crypto_
  		 container_of(alg, struct caam_aead_alg, aead);
  	struct caam_ctx *ctx = crypto_aead_ctx(tfm);