arm64: dts: Add/fix /memory node unit-addresses
Subsystems (11)
Rob Herring (Arm)
maintainerPATCH 1/1 arm64: dts: Add/fix /memory node unit-addresses
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes.
It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement.
---
SoC maintainers, please take this directly.
arm32 is much worse, but the platforms using ATAG to DT code can't be changed and I don't know which ones those are.
arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 2 +- arch/arm64/boot/dts/apm/apm-merlin.dts | 2 +- arch/arm64/boot/dts/apm/apm-mustang.dts | 2 +- arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 +- arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +- arch/arm64/boot/dts/cavium/thunder2-99xx.dts | 2 +- arch/arm64/boot/dts/lg/lg1312-ref.dts | 2 +- arch/arm64/boot/dts/lg/lg1313-ref.dts | 2 +- arch/arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts | 2 +- arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 2 +- arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +- arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
arch/arm64/boot/dts/actions/s700-cubieboard7.dts +1 -1
@@ -24,7 +24,7 @@ memory@0 { reg = <0x0 0x0 0x0 0x80000000>; }; - memory@1,e0000000 { + memory@1e0000000 { device_type = "memory"; reg = <0x1 0xe0000000 0x0 0x0>; };
arch/arm64/boot/dts/apm/apm-merlin.dts +1 -1
@@ -15,7 +15,7 @@ / { chosen { }; - memory { + memory@100000000 { device_type = "memory"; reg = < 0x1 0x00000000 0x0 0x80000000 >; };
arch/arm64/boot/dts/apm/apm-mustang.dts +1 -1
@@ -15,7 +15,7 @@ / { chosen { }; - memory { + memory@100000000 { device_type = "memory"; reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */ };
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts +1 -1
@@ -50,7 +50,7 @@ chosen { bootargs = "earlycon=uart8250,mmio32,0x66130000"; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x00000000 0x80000000 0x00000000 0x40000000>; };
arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts +1 -1
@@ -47,7 +47,7 @@ chosen { bootargs = "earlycon=uart8250,mmio32,0x66130000"; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x00000000 0x80000000 0x00000001 0x00000000>; };
arch/arm64/boot/dts/cavium/thunder2-99xx.dts +1 -1
@@ -14,7 +14,7 @@ / { model = "Cavium ThunderX2 CN99XX"; compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc"; - memory { + memory@80000000 { device_type = "memory"; reg = <0x00000000 0x80000000 0x0 0x80000000>, /* 2G @ 2G */ <0x00000008 0x80000000 0x0 0x80000000>; /* 2G @ 34G */
arch/arm64/boot/dts/lg/lg1312-ref.dts +1 -1
@@ -22,7 +22,7 @@ aliases { serial2 = &uart2; }; - memory { + memory@0 { device_type = "memory"; reg = <0x0 0x00000000 0x20000000>; };
arch/arm64/boot/dts/lg/lg1313-ref.dts +1 -1
@@ -22,7 +22,7 @@ aliases { serial2 = &uart2; }; - memory { + memory@0 { device_type = "memory"; reg = <0x0 0x00000000 0x20000000>; };
arch/arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts +1 -1
@@ -16,7 +16,7 @@ chosen { stdout-path = &serial0; }; - memory { + memory@0 { reg = <0x0 0x0 0x0 0x40000000>; }; };
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +1 -1
@@ -25,7 +25,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x0 0xc0000000>; };
arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi +1 -1
@@ -16,7 +16,7 @@ chosen { stdout-path = "serial0"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x0 0x20000000>; };
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +1 -1
@@ -17,7 +17,7 @@ chosen { stdout-path = "serial2:115200n8"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>; };
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +1 -1
@@ -21,7 +21,7 @@ chosen { stdout-path = "serial2:115200n8"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>; };
arch/arm64/boot/dts/rockchip/rk3368-r88.dts +1 -1
@@ -21,7 +21,7 @@ chosen { stdout-path = "serial2:115200n8"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>; };
arch/arm64/boot/dts/sprd/sp9860g-1h10.dts +1 -1
@@ -24,7 +24,7 @@ aliases { spi0 = &adi_bus; }; - memory{ + memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0 0x60000000>, <0x1 0x80000000 0 0x60000000>;
Signature · 1 line
2.43.0
Quoted 12 lines · Rob Herring (Arm)
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes.
It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement.
Signed-off-by Rob Herring (Arm) <[email protected]>---
SoC maintainers, please take this directly.
Quoted 8 lines
arm32 is much worse, but the platforms using ATAG to DT code can't be changed and I don't know which ones those are.
arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 2 +- arch/arm64/boot/dts/apm/apm-merlin.dts | 2 +- arch/arm64/boot/dts/apm/apm-mustang.dts | 2 +- arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 +- arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +-
For the above two:
Signature · 1 line
Florian
Am Dienstag, 30. April 2024, 21:18:54 CEST schrieb Rob Herring (Arm):
Quoted 8 lines
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes.
It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement.
Quoted 6 lines
Signed-off-by Rob Herring (Arm) <[email protected]>---
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
For the Rockchip boards
Other rk3368-based boards like the Geekbox and PX5-evb already use the correct memory@0 node names, so it looks like the the bootloaders used on rk3368 don't have special requirements for the node-naming.
arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi chosen { · line 22
Quoted 10 lines · Rob Herring (Arm)
+++
b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsiarch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi +1
-1@@ -16,7 +16,7 @@ chosen { stdout-path = "serial0"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x0 0x20000000>; };
Quoted 10 lines · Rob Herring (Arm)
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes.
It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement.
arch/arm64/boot/dts/lg/lg1312-ref.dts | 2 +- arch/arm64/boot/dts/lg/lg1313-ref.dts | 2 +-
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 11 lines · Rob Herring (Arm)
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes.
It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement.
Signed-off-by Rob Herring (Arm) <[email protected]>---
SoC maintainers, please take this directly.
Best regards,
Krzysztof
This patch was applied to soc/soc.git (for-next) by Arnd Bergmann <[email protected]>:
Hello:
This patch was applied to soc/soc.git (for-next)
by Arnd Bergmann <[email protected]>:
Quoted 9 lines · On Tue, 30 Apr 2024 14:18:54 -0500 you wrote:
'/memory' nodes always have a 'reg' property, and therefore should have a unit-address with just plain hex (i.e. no commas). Fix all the arm64 '/memory' nodes.
It's possible that some bootloader depends on /memory (arm32 ATAG to DT code does for example). If so, the memory node should be commented with that requirement.
[...]
Here is the summary with links:
- arm64: dts: Add/fix /memory node unit-addresses
https://git.kernel.org/soc/soc/c/5c04a5b065e9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On Tue, Apr 30, 2024 at 02:18:54PM GMT, Rob Herring (Arm) wrote:
[...]
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts chosen { · line 31
Quoted 13 lines
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +1
-1@@ -25,7 +25,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x0 0xc0000000>; };
[trimming the recipient list and adding Diogo]
Sorry I just noticed this as I was doing a cleanup path of patchwork.
For tegra210-smaug, unfortunately we can't do this. The problem is that the firmware for this device looks for a hard-coded /memory device when updating with the proper memory size and this firmware can't always be updated.
Diogo, you're one of the few remaining people that I know of that still use this device (with an upstream kernel). Do you have any more details about this? Is there any way the firmware can be safely updated on these devices?
Thierry
Hi Thierry,
Quoted 25 lines · Thierry Reding
On Tue, Apr 30, 2024 at 02:18:54PM GMT, Rob Herring (Arm) wrote:
[...]arch/arm64/boot/dts/nvidia/tegra210-smaug.dts chosen { · line 31
Quoted 13 lines
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +1
-1@@ -25,7 +25,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x0 0xc0000000>; };[trimming the recipient list and adding Diogo]
Sorry I just noticed this as I was doing a cleanup path of patchwork.
For tegra210-smaug, unfortunately we can't do this. The problem is that the firmware for this device looks for a hard-coded /memory device when updating with the proper memory size and this firmware can't always be updated.
Quoted 4 lines
Diogo, you're one of the few remaining people that I know of that still use this device (with an upstream kernel). Do you have any more details about this? Is there any way the firmware can be safely updated on these devices?
To be honest I am not quite sure. I do know that at least there is a part of the firmware that is locked down and cannot be updated easily, as you have to disconnect a ribbon cable inside of the device. Do you know of any firmware updates for this device? Currently I am not aware of any.
Diogo