diff mbox series

ARM: dts: dra7: Add bus_dma_limit for l4 cfg bus

Message ID 20241114155759.1155567-1-romain.naour@smile.fr (mailing list archive)
State New
Headers show
Series ARM: dts: dra7: Add bus_dma_limit for l4 cfg bus | expand

Commit Message

Romain Naour Nov. 14, 2024, 3:57 p.m. UTC
From: Romain Naour <romain.naour@skf.com>

A bus_dma_limit was added for l3 bus by commit cfb5d65f2595
("ARM: dts: dra7: Add bus_dma_limit for L3 bus") to fix an issue
observed only with SATA on DRA7-EVM with 4GB RAM and CONFIG_ARM_LPAE
enabled.

Since kernel 5.13, the SATA issue can be reproduced again following
the SATA node move from L3 bus to L4_cfg in commit 8af15365a368
("ARM: dts: Configure interconnect target module for dra7 sata").

Fix it by adding an empty dma-ranges property to l4_cfg and
segment@100000 nodes (parent device tree node of SATA controller) to
inherit the 2GB dma ranges limit from l3 bus node.

Note: A similar fix was applied for PCIe controller by commit
90d4d3f4ea45 ("ARM: dts: dra7: Fix bus_dma_limit for PCIe").

Fixes: 8af15365a368 ("ARM: dts: Configure interconnect target module for dra7 sata").
Link: https://lore.kernel.org/linux-omap/c583e1bb-f56b-4489-8012-ce742e85f233@smile.fr/
Signed-off-by: Romain Naour <romain.naour@skf.com>
---
 arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 ++
 1 file changed, 2 insertions(+)

Comments

Roger Quadros Nov. 15, 2024, 9:20 a.m. UTC | #1
On 14/11/2024 17:57, Romain Naour wrote:
> From: Romain Naour <romain.naour@skf.com>
> 
> A bus_dma_limit was added for l3 bus by commit cfb5d65f2595
> ("ARM: dts: dra7: Add bus_dma_limit for L3 bus") to fix an issue
> observed only with SATA on DRA7-EVM with 4GB RAM and CONFIG_ARM_LPAE
> enabled.
> 
> Since kernel 5.13, the SATA issue can be reproduced again following
> the SATA node move from L3 bus to L4_cfg in commit 8af15365a368
> ("ARM: dts: Configure interconnect target module for dra7 sata").
> 
> Fix it by adding an empty dma-ranges property to l4_cfg and
> segment@100000 nodes (parent device tree node of SATA controller) to
> inherit the 2GB dma ranges limit from l3 bus node.
> 
> Note: A similar fix was applied for PCIe controller by commit
> 90d4d3f4ea45 ("ARM: dts: dra7: Fix bus_dma_limit for PCIe").
> 
> Fixes: 8af15365a368 ("ARM: dts: Configure interconnect target module for dra7 sata").
> Link: https://lore.kernel.org/linux-omap/c583e1bb-f56b-4489-8012-ce742e85f233@smile.fr/

Please add the stable tag here

Cc: <stable@vger.kernel.org> # 5.13

> Signed-off-by: Romain Naour <romain.naour@skf.com>
> ---
Romain Naour Nov. 15, 2024, 10:28 a.m. UTC | #2
Hello Roger,

Le 15/11/2024 à 10:20, Roger Quadros a écrit :
> 
> 
> On 14/11/2024 17:57, Romain Naour wrote:
>> From: Romain Naour <romain.naour@skf.com>
>>
>> A bus_dma_limit was added for l3 bus by commit cfb5d65f2595
>> ("ARM: dts: dra7: Add bus_dma_limit for L3 bus") to fix an issue
>> observed only with SATA on DRA7-EVM with 4GB RAM and CONFIG_ARM_LPAE
>> enabled.
>>
>> Since kernel 5.13, the SATA issue can be reproduced again following
>> the SATA node move from L3 bus to L4_cfg in commit 8af15365a368
>> ("ARM: dts: Configure interconnect target module for dra7 sata").
>>
>> Fix it by adding an empty dma-ranges property to l4_cfg and
>> segment@100000 nodes (parent device tree node of SATA controller) to
>> inherit the 2GB dma ranges limit from l3 bus node.
>>
>> Note: A similar fix was applied for PCIe controller by commit
>> 90d4d3f4ea45 ("ARM: dts: dra7: Fix bus_dma_limit for PCIe").
>>
>> Fixes: 8af15365a368 ("ARM: dts: Configure interconnect target module for dra7 sata").
>> Link: https://lore.kernel.org/linux-omap/c583e1bb-f56b-4489-8012-ce742e85f233@smile.fr/
> 
> Please add the stable tag here
> 
> Cc: <stable@vger.kernel.org> # 5.13

checkpatch.pl was complaining about "Cc: <stable@vger.kernel.org>" I tried
yesterday. Now it fine with "# 5.13" tag.

Thanks!

Best regards,
Romain


> 
>> Signed-off-by: Romain Naour <romain.naour@skf.com>
>> ---
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi b/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi
index 6e67d99832ac..ba7fdaae9c6e 100644
--- a/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/ti/omap/dra7-l4.dtsi
@@ -12,6 +12,7 @@  &l4_cfg {						/* 0x4a000000 */
 	ranges = <0x00000000 0x4a000000 0x100000>,	/* segment 0 */
 		 <0x00100000 0x4a100000 0x100000>,	/* segment 1 */
 		 <0x00200000 0x4a200000 0x100000>;	/* segment 2 */
+	dma-ranges;
 
 	segment@0 {					/* 0x4a000000 */
 		compatible = "simple-pm-bus";
@@ -557,6 +558,7 @@  segment@100000 {					/* 0x4a100000 */
 			 <0x0007e000 0x0017e000 0x001000>,	/* ap 124 */
 			 <0x00059000 0x00159000 0x001000>,	/* ap 125 */
 			 <0x0005a000 0x0015a000 0x001000>;	/* ap 126 */
+		dma-ranges;
 
 		target-module@2000 {			/* 0x4a102000, ap 27 3c.0 */
 			compatible = "ti,sysc";