diff mbox

arm64: dts: marvell: mark the cp110 crypto engine as dma coherent

Message ID 20170717073516.26746-1-antoine.tenart@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Antoine Tenart July 17, 2017, 7:35 a.m. UTC
The crypto engines found on the cp110 master and slave are dma coherent.
This patch adds the relevant property to their dt nodes.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 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(+)

Comments

Gregory CLEMENT July 18, 2017, 9:45 a.m. UTC | #1
Hi Antoine,
 
 On lun., juil. 17 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

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

Is it a fix?

Should it go to the current ans stable kernel?

Thanks,

Gregory

>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> ---
>  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 726528ce54e9..4c68605675a8 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> @@ -270,6 +270,7 @@
>  				interrupt-names = "mem", "ring0", "ring1",
>  				"ring2", "ring3", "eip";
>  				clocks = <&cpm_clk 1 26>;
> +				dma-coherent;
>  			};
>  		};
>  
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> index 95f8e5f607f6..0dbb59811d00 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> @@ -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
> -- 
> 2.13.3
>
Antoine Tenart July 18, 2017, 9:51 a.m. UTC | #2
Hi Gregory,

On Tue, Jul 18, 2017 at 11:45:24AM +0200, Gregory CLEMENT wrote:
>  On lun., juil. 17 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:
> 
> > The crypto engines found on the cp110 master and slave are dma coherent.
> > This patch adds the relevant property to their dt nodes.
> 
> Is it a fix?
> 
> Should it go to the current ans stable kernel?

Yes I think that should go into stable. I forgot the stable tag, do you
want me to send a v2 with it included?

Thanks!
Antoine
Gregory CLEMENT July 18, 2017, 10:03 a.m. UTC | #3
Hi Antoine,
 
 On mar., juil. 18 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:

> Hi Gregory,
>
> On Tue, Jul 18, 2017 at 11:45:24AM +0200, Gregory CLEMENT wrote:
>>  On lun., juil. 17 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote:
>> 
>> > The crypto engines found on the cp110 master and slave are dma coherent.
>> > This patch adds the relevant property to their dt nodes.
>> 
>> Is it a fix?
>> 
>> Should it go to the current ans stable kernel?
>
> Yes I think that should go into stable. I forgot the stable tag, do you
> want me to send a v2 with it included?
>
Yes please and also add the Fixes tag.

Thanks,

Gregory

> Thanks!
> Antoine

>
> -- 
> Antoine Ténart, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
>
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 726528ce54e9..4c68605675a8 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -270,6 +270,7 @@ 
 				interrupt-names = "mem", "ring0", "ring1",
 				"ring2", "ring3", "eip";
 				clocks = <&cpm_clk 1 26>;
+				dma-coherent;
 			};
 		};
 
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 95f8e5f607f6..0dbb59811d00 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -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