[PATCH AUTOSEL 5.4 182/205] Revert "arm64: dts: juno: add dma-ranges property"

Sasha Levin sashal at kernel.org
Thu Jan 16 08:42:37 PST 2020


From: Sudeep Holla <sudeep.holla at arm.com>

[ Upstream commit 54fb3fe0f211d4729a2551cf9497bd612189af9d ]

This reverts commit 193d00a2b35ee3353813b4006a18131122087205.

Commit 951d48855d86 ("of: Make of_dma_get_range() work on bus nodes")
reworked the logic such that of_dma_get_range() works correctly
starting from a bus node containing "dma-ranges".

Since on Juno we don't have a SoC level bus node and "dma-ranges" is
present only in the root node, we get the following error:

OF: translation of DMA address(0) to CPU address failed node(/sram at 2e000000)
OF: translation of DMA address(0) to CPU address failed node(/uart at 7ff80000)
...
OF: translation of DMA address(0) to CPU address failed node(/mhu at 2b1f0000)
OF: translation of DMA address(0) to CPU address failed node(/iommu at 2b600000)
OF: translation of DMA address(0) to CPU address failed node(/iommu at 2b600000)
OF: translation of DMA address(0) to CPU address failed node(/iommu at 2b600000)

So let's fix it by dropping the "dma-ranges" property for now. This
should be fine since it doesn't represent any kind of device-visible
restriction; it was only there for completeness, and we've since given
in to the assumption that missing "dma-ranges" implies a 1:1 mapping
anyway.

We can add it later with a proper SoC bus node and moving all the
devices that belong there along with the "dma-ranges" if required.

Fixes: 193d00a2b35e ("arm64: dts: juno: add dma-ranges property")
Cc: Rob Herring <robh+dt at kernel.org>
Cc: Liviu Dudau <liviu.dudau at arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
Acked-by: Robin Murphy <robin.murphy at arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>
Signed-off-by: Sasha Levin <sashal at kernel.org>
---
 arch/arm64/boot/dts/arm/juno-base.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 26a039a028b8..8c11660bbe40 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -6,7 +6,6 @@
 	/*
 	 *  Devices shared by all Juno boards
 	 */
-	dma-ranges = <0 0 0 0 0x100 0>;
 
 	memtimer: timer at 2a810000 {
 		compatible = "arm,armv7-timer-mem";
-- 
2.20.1




More information about the linux-arm-kernel mailing list