apm821xx: backport crypto4xx patches from 4.15

This patch backports changes to crypto4xx in order
to get the crypto4xx operational.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

1 files changed, 59 insertions, 0 deletions

diff --git a/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch b/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch
new file mode 100644
index 0000000000..90a6dab2d7
--- /dev/null
+++ b/target/linux/apm821xx/patches-4.14/020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch
@@ -0,0 +1,59 @@
+From 40e3b847bff70edc28c5290d209e531da6f9e534 Mon Sep 17 00:00:00 2001
+From: Christian Lamparter <chunkeey@googlemail.com>
+Date: Fri, 25 Aug 2017 15:47:23 +0200
+Subject: [PATCH 10/25] crypto: crypto4xx - replace crypto4xx_dev's
+ scatter_buffer_size with constant
+
+scatter_buffer_size is always set to PPC4XX_SD_BUFFER_SIZE.
+I don't think there's any point in keeping the variable
+around.
+
+Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+---
+ drivers/crypto/amcc/crypto4xx_core.c | 7 +++----
+ drivers/crypto/amcc/crypto4xx_core.h | 1 -
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+--- a/drivers/crypto/amcc/crypto4xx_core.c
++++ b/drivers/crypto/amcc/crypto4xx_core.c
+@@ -394,10 +394,9 @@ static u32 crypto4xx_build_sdr(struct cr
+ 	if (!dev->sdr)
+ 		return -ENOMEM;
+ 
+-	dev->scatter_buffer_size = PPC4XX_SD_BUFFER_SIZE;
+ 	dev->scatter_buffer_va =
+ 		dma_alloc_coherent(dev->core_dev->device,
+-			dev->scatter_buffer_size * PPC4XX_NUM_SD,
++			PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
+ 			&dev->scatter_buffer_pa, GFP_ATOMIC);
+ 	if (!dev->scatter_buffer_va) {
+ 		dma_free_coherent(dev->core_dev->device,
+@@ -410,7 +409,7 @@ static u32 crypto4xx_build_sdr(struct cr
+ 
+ 	for (i = 0; i < PPC4XX_NUM_SD; i++) {
+ 		sd_array[i].ptr = dev->scatter_buffer_pa +
+-				  dev->scatter_buffer_size * i;
++				  PPC4XX_SD_BUFFER_SIZE * i;
+ 	}
+ 
+ 	return 0;
+@@ -425,7 +424,7 @@ static void crypto4xx_destroy_sdr(struct
+ 
+ 	if (dev->scatter_buffer_va != NULL)
+ 		dma_free_coherent(dev->core_dev->device,
+-				  dev->scatter_buffer_size * PPC4XX_NUM_SD,
++				  PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
+ 				  dev->scatter_buffer_va,
+ 				  dev->scatter_buffer_pa);
+ }
+--- a/drivers/crypto/amcc/crypto4xx_core.h
++++ b/drivers/crypto/amcc/crypto4xx_core.h
+@@ -87,7 +87,6 @@ struct crypto4xx_device {
+ 					program ce sdr_base_register */
+ 	void *scatter_buffer_va;
+ 	dma_addr_t scatter_buffer_pa;
+-	u32 scatter_buffer_size;
+ 
+ 	void *shadow_sa_pool;		/* pool of memory for sa in pd_uinfo */
+ 	dma_addr_t shadow_sa_pool_pa;