Hi,

On Mon, Nov 13, 2017 at 04:51:22PM +0100, Antoine Tenart wrote:

commit ec0aef9881d18aa781268ec9cba8eba5b202f5b4 upstream.

The crypto engines found on the cp110 master and slave are dma coherent. This patch adds the relevant property to their dt nodes.

Cc: stable@vger.kernel.org # v4.12+ Fixes: 973020fd9498 ("arm64: marvell: dts: add crypto engine description for 7k/8k") Signed-off-by: Antoine Tenart antoine.tenart@free-electrons.com Signed-off-by: Gregory CLEMENT gregory.clement@free-electrons.com Signed-off-by: Antoine Tenart antoine.tenart@free-electrons.com

There is a duplicate signature. Can you remove it when applying or do you guys want a new patch?

Antoine

---

Hi,

This patch did not apply to the 4.12-stable tree. Since the original patch made it to Linus tree, this is a version which applies nicely to the 4.12-stable tree.

Thanks, Antoine

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 1 + arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 1 + 2 files changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index b4bc42ece754..4e81130ae84a 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -240,6 +240,7 @@ interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3", "eip"; clocks = <&cpm_syscon0 1 26>;

• 		dma-coherent;
  	status = "disabled";
  };
  

  };

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi index 6e2058847ddc..b987565107f3 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -230,6 +230,7 @@ interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3", "eip"; clocks = <&cps_syscon0 1 26>;

• 		dma-coherent;
  	status = "disabled";
  };
  

  };

-- 2.14.3