Skip to contentSkip to conversation

ARM64: dts: meson-gx: fix ATF reserved memory region

PATCH New Kevin Hilman 1 participant 2 messages Jun 7, 2018 – Jun 8, 2018

Subsystems (2)
Device tree bindings Arm/Amlogic Meson SoC support
lore
Share & tools
lore

Kevin Hilman

author maintainer
#0 lore raw

PATCH 1/1 ARM64: dts: meson-gx: fix ATF reserved memory region

Vendor firmware/uboot has different reserved regions depending on firmware version, but current codebase reserves the same regions on GXL and GXBB, so move the additional reserved memory region to common .dtsi.

Found when putting a recent vendor u-boot on meson-gxbb-p200.

Recommended-by Neil Armstrong <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi  | 6 ++++++
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +6 -0
index b003f324ca31..b8dc4dbb391b 100644
@@ -35,6 +35,12 @@
 			no-map;
 		};
 
+		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved_alt: secmon at 5000000 {
+			reg = <0x0 0x05000000 0x0 0x300000>;
+			no-map;
+		};
+
 		linux,cma {
 			compatible = "shared-dma-pool";
 			reusable;
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +0 -8
index 27538eea547b..c87a80e9bcc6 100644
@@ -13,14 +13,6 @@
 / {
 	compatible = "amlogic,meson-gxl";
 
-	reserved-memory {
-		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
-		secmon_reserved_alt: secmon at 5000000 {
-			reg = <0x0 0x05000000 0x0 0x300000>;
-			no-map;
-		};
-	};
-
 	soc {
 		usb0: usb at c9000000 {
 			status = "disabled";
Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH 1/1 ARM64: dts: meson-gx: fix ATF reserved memory region

Quoted 8 lines · Kevin Hilman

Vendor firmware/uboot has different reserved regions depending on firmware version, but current codebase reserves the same regions on GXL and GXBB, so move the additional reserved memory region to common .dtsi.

Found when putting a recent vendor u-boot on meson-gxbb-p200.

Recommended-by Neil Armstrong <[email protected]>

oops, this should've been the more common "Suggested-by". Fixed, and then...

Quoted 1 line
Signed-off-by Kevin Hilman <[email protected]>

...added a Cc:stable and applied to v4.18/fixes.

Kevin

Quoted 41 lines
---
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi  | 6 ++++++
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +6 -0
index b003f324ca31..b8dc4dbb391b 100644
@@ -35,6 +35,12 @@
 			no-map;
 		};
 
+		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved_alt: secmon at 5000000 {
+			reg = <0x0 0x05000000 0x0 0x300000>;
+			no-map;
+		};
+
 		linux,cma {
 			compatible = "shared-dma-pool";
 			reusable;
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +0 -8
index 27538eea547b..c87a80e9bcc6 100644
@@ -13,14 +13,6 @@
 / {
 	compatible = "amlogic,meson-gxl";
 
-	reserved-memory {
-		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
-		secmon_reserved_alt: secmon at 5000000 {
-			reg = <0x0 0x05000000 0x0 0x300000>;
-			no-map;
-		};
-	};
-
 	soc {
 		usb0: usb at c9000000 {
 			status = "disabled";