Skip to contentSkip to conversation

FAILED: patch "[PATCH] arm64: dts: marvell: mark the cp110 crypto engine as dma" failed to apply to 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 7, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From ec0aef9881d18aa781268ec9cba8eba5b202f5b4 Mon Sep 17 00:00:00 2001

From: Antoine Tenart <[email protected]>
Date: Wed, 19 Jul 2017 11:04:26 +0200
Subject: [PATCH] arm64: dts: marvell: mark the cp110 crypto engine as dma
coherent

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

Cc [email protected] # v4.12+
Fixes 973020fd9498 ("arm64: marvell: dts: add crypto engine description for 7k/8k")
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +1 -0
index 726528ce54e9..4c68605675a8 100644
@@ -270,6 +270,7 @@
 				interrupt-names = "mem", "ring0", "ring1",
 				"ring2", "ring3", "eip";
 				clocks = <&cpm_clk 1 26>;
+				dma-coherent;
 			};
 		};
 
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +1 -0
index 471aaf8dc750..923f354b02f0 100644
@@ -261,6 +261,7 @@
 				interrupt-names = "mem", "ring0", "ring1",
 						  "ring2", "ring3", "eip";
 				clocks = <&cps_clk 1 26>;
+				dma-coherent;
 				/*
 				 * The cryptographic engine found on the cp110
 				 * master is enabled by default at the SoC