From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 27 Mar 2021 14:23:19 +0000 (+0100)
Subject: 4.9-stable patches
X-Git-Tag: v5.11.11~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38e6fcdd9e19d275b5b2d7a0a5ac520c0578ffea;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	arm64-dts-ls1043a-mark-crypto-engine-dma-coherent.patch
---

diff --git a/queue-4.9/arm64-dts-ls1043a-mark-crypto-engine-dma-coherent.patch b/queue-4.9/arm64-dts-ls1043a-mark-crypto-engine-dma-coherent.patch
new file mode 100644
index 00000000000..5da3e9bbb03
--- /dev/null
+++ b/queue-4.9/arm64-dts-ls1043a-mark-crypto-engine-dma-coherent.patch
@@ -0,0 +1,39 @@
+From 4fb3a074755b7737c4081cffe0ccfa08c2f2d29d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com>
+Date: Sun, 7 Mar 2021 22:47:36 +0200
+Subject: arm64: dts: ls1043a: mark crypto engine dma coherent
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Horia Geantă <horia.geanta@nxp.com>
+
+commit 4fb3a074755b7737c4081cffe0ccfa08c2f2d29d upstream.
+
+Crypto engine (CAAM) on LS1043A platform is configured HW-coherent,
+mark accordingly the DT node.
+
+Lack of "dma-coherent" property for an IP that is configured HW-coherent
+can lead to problems, similar to what has been reported for LS1046A.
+
+Cc: <stable@vger.kernel.org> # v4.8+
+Fixes: 63dac35b58f4 ("arm64: dts: ls1043a: add crypto node")
+Link: https://lore.kernel.org/linux-crypto/fe6faa24-d8f7-d18f-adfa-44fa0caa1598@arm.com
+Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
+Acked-by: Li Yang <leoyang.li@nxp.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
++++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+@@ -177,6 +177,7 @@
+ 			ranges = <0x0 0x00 0x1700000 0x100000>;
+ 			reg = <0x00 0x1700000 0x0 0x100000>;
+ 			interrupts = <0 75 0x4>;
++			dma-coherent;
+ 
+ 			sec_jr0: jr@10000 {
+ 				compatible = "fsl,sec-v5.4-job-ring",
diff --git a/queue-4.9/series b/queue-4.9/series
index 55bfaf4b71d..9554d9cdff4 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -17,3 +17,4 @@ ia64-fix-ptrace-ptrace_syscall_info_exit-sign.patch
 x86-tlb-flush-global-mappings-when-kaiser-is-disable.patch
 squashfs-fix-inode-lookup-sanity-checks.patch
 squashfs-fix-xattr-id-and-id-lookup-sanity-checks.patch
+arm64-dts-ls1043a-mark-crypto-engine-dma-coherent.patch