Skip to contentSkip to conversation

sunxi: last-minute H616 fixes

PATCH In review Andre Przywara 3 participants 8 messages Mar 30, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover sunxi: last-minute H616 fixes

The link address of the BL31 Trusted Firmware code has changed during the development, so we need to fix the load address in our FIT image template accordingly. The H616 TF-A patches are about to be merged now:

https://review.trustedfirmware.org/q/topic:%22allwinner_h616%22+(status:open%20OR%20status:merged)

Since H616 support was introduced in this cycle's merge window, we should merge those fixes before the release, to avoid compatiblity issues.

The second patch defers to TF-A to add the reserved memory node, we didn't have this code in the TF-A series initially. Having two conflicting reserved memory locations doesn't fly very well, so this one drops our hardcoded version.

Thanks!
Andre

Andre Przywara (2):
sunxi: H616: Change TF-A load address to beginning of DRAM
sunxi: dts: H616: Drop reserved-memory node

 arch/arm/dts/sun50i-h616.dtsi  | 12 ------------
 arch/arm/dts/sunxi-u-boot.dtsi |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)
Signature · 1 line
2.17.5
#1 lore raw

PATCH 1/2 sunxi: H616: Change TF-A load address to beginning of DRAM

Loading Trusted-Firmware's BL31 at 16KB into DRAM was originally a hack to allow sharing more code with the other SoCs (which use this offset in SRAM). However there is no longer a reason for that, as the problematic macros have been properly separated there.

The latest (and hopefully final) TF-A code drop now changes the load address to the beginning of DRAM, which is also more easily protected by the Trustzone memory controller (code to be done).

Adjust the load address of BL31 now, to avoid any issues with incompatible versions later on (the TF-A patches are about to be merged).

---
 arch/arm/dts/sunxi-u-boot.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/sunxi-u-boot.dtsi +1 -1
index abe629c55e5..cd096bf2a06 100644
@@ -4,7 +4,7 @@
 #define BL31_ADDR 0x104000
 #define  SCP_ADDR 0x114000
 #elif defined(CONFIG_MACH_SUN50I_H616)
-#define BL31_ADDR 0x40004000
+#define BL31_ADDR 0x40000000
 #else
 #define BL31_ADDR  0x44000
 #define  SCP_ADDR  0x50000
Signature · 1 line
2.17.5
maintainer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] sunxi: H616: Change TF-A load address to beginning of DRAM

Quoted 5 lines · Andre Przywara

Loading Trusted-Firmware's BL31 at 16KB into DRAM was originally a hack to allow sharing more code with the other SoCs (which use this offset in SRAM). However there is no longer a reason for that, as the problematic macros have been properly separated there.

Quoted 8 lines

The latest (and hopefully final) TF-A code drop now changes the load address to the beginning of DRAM, which is also more easily protected by the Trustzone memory controller (code to be done).

Adjust the load address of BL31 now, to avoid any issues with incompatible versions later on (the TF-A patches are about to be merged).

Quoted 18 lines
---
 arch/arm/dts/sunxi-u-boot.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/sunxi-u-boot.dtsi +1 -1
index abe629c55e5..cd096bf2a06 100644
@@ -4,7 +4,7 @@
 #define BL31_ADDR 0x104000
 #define  SCP_ADDR 0x114000
 #elif defined(CONFIG_MACH_SUN50I_H616)
-#define BL31_ADDR 0x40004000
+#define BL31_ADDR 0x40000000
 #else
 #define BL31_ADDR  0x44000
 #define  SCP_ADDR  0x50000
#3 lore raw

PATCH 2/2 sunxi: dts: H616: Drop reserved-memory node

In reply to Andre Przywara

Trusted Firmware now adds the /reserved-memory subnode to the DT at runtime[1], putting in the right values.

Drop our hard-coded version, as this might clash with the actual values (which have also changed), and rely on TF-A to add the node.

[1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770

---
 arch/arm/dts/sun50i-h616.dtsi | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm/dts/sun50i-h616.dtsi +0 -12
index 953e8fac20f..dd4d2f31111 100644
@@ -51,18 +51,6 @@
 		};
 	};
 
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		/* 512KiB reserved for ARM Trusted Firmware (BL31) */
-		secmon_reserved: secmon at 40000000 {
-			reg = <0x0 0x40000000 0x0 0x80000>;
-			no-map;
-		};
-	};
-
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
Signature · 1 line
2.17.5
#4 lore raw

Re: [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node

Quoted 24 lines · Andre Przywara

Trusted Firmware now adds the /reserved-memory subnode to the DT at runtime[1], putting in the right values.

Drop our hard-coded version, as this might clash with the actual values (which have also changed), and rely on TF-A to add the node.

[1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770

---
 arch/arm/dts/sun50i-h616.dtsi | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm/dts/sun50i-h616.dtsi +0 -2
index 953e8fac20f..dd4d2f31111 100644
@@ -51,18 +51,6 @@
                };
        };
 
-       reserved-memory {
-               #address-cells = <2>;

arch/arm/dts/sun50i-h616.dtsi line 65

Quoted 10 lines
arch/arm/dts/sun50i-h616.dtsi +0 -10
-               #size-cells = <2>;
-               ranges;
-
-               /* 512KiB reserved for ARM Trusted Firmware (BL31) */
-               secmon_reserved: secmon at 40000000 {
-                       reg = <0x0 0x40000000 0x0 0x80000>;
-                       no-map;
-               };
-       };
-

As said always. it's better to not touch Linux dts files. If the same fix same available in Linux add SHA1 on the commit message otherwise keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar at least on sunxi.

Jagan.

maintainer Reviewed-by
#5 lore raw

Re: [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node

Quoted 11 lines · Jagan Teki
Quoted 10 lines · Andre Przywara

Trusted Firmware now adds the /reserved-memory subnode to the DT at runtime[1], putting in the right values.

Drop our hard-coded version, as this might clash with the actual values (which have also changed), and rely on TF-A to add the node.

[1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770

Quoted 21 lines
Quoted 21 lines
---
 arch/arm/dts/sun50i-h616.dtsi | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm/dts/sun50i-h616.dtsi +0 -9
index 953e8fac20f..dd4d2f31111 100644
@@ -51,18 +51,6 @@
                };
        };
 
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               /* 512KiB reserved for ARM Trusted Firmware (BL31) */
-               secmon_reserved: secmon at 40000000 {
-                       reg = <0x0 0x40000000 0x0 0x80000>;
-                       no-map;
Quoted 8 lines

arch/arm/dts/sun50i-h616.dtsi line 65

Quoted 3 lines
arch/arm/dts/sun50i-h616.dtsi +0 -3
-               };
-       };
-

As said always. it's better to not touch Linux dts files. If the same fix same available in Linux add SHA1 on the commit message otherwise keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar at least on sunxi.

This file has not yet been added to the Linux tree, so that rule does not apply in this case.

Cheers,
Samuel

Quoted 2 lines

Jagan.

Reviewed-by
#6 lore raw

Re: [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node

Quoted 46 lines · Samuel Holland
Quoted 11 lines · Jagan Teki
Quoted 10 lines · Andre Przywara

Trusted Firmware now adds the /reserved-memory subnode to the DT at runtime[1], putting in the right values.

Drop our hard-coded version, as this might clash with the actual values (which have also changed), and rely on TF-A to add the node.

[1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770

Quoted 21 lines
Quoted 21 lines
---
 arch/arm/dts/sun50i-h616.dtsi | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm/dts/sun50i-h616.dtsi +0 -9
index 953e8fac20f..dd4d2f31111 100644
@@ -51,18 +51,6 @@
                };
        };
 
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               /* 512KiB reserved for ARM Trusted Firmware (BL31) */
-               secmon_reserved: secmon at 40000000 {
-                       reg = <0x0 0x40000000 0x0 0x80000>;
-                       no-map;
Quoted 8 lines

arch/arm/dts/sun50i-h616.dtsi line 65

Quoted 3 lines
arch/arm/dts/sun50i-h616.dtsi +0 -3
-               };
-       };
-

As said always. it's better to not touch Linux dts files. If the same fix same available in Linux add SHA1 on the commit message otherwise keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar at least on sunxi.

Quoted 2 lines

This file has not yet been added to the Linux tree, so that rule does not apply in this case.

#7 lore raw

Re: [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node

In reply to Jagan Teki

On Tue, 30 Mar 2021 18:58:23 +0530
Jagan Teki <[email protected]> wrote:

Hi Jagan,

Quoted 32 lines · Andre Przywara
Quoted 31 lines

Trusted Firmware now adds the /reserved-memory subnode to the DT at runtime[1], putting in the right values.

Drop our hard-coded version, as this might clash with the actual values (which have also changed), and rely on TF-A to add the node.

[1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770

---
 arch/arm/dts/sun50i-h616.dtsi | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm/dts/sun50i-h616.dtsi +0 -9
index 953e8fac20f..dd4d2f31111 100644
@@ -51,18 +51,6 @@
                };
        };
 
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               /* 512KiB reserved for ARM Trusted Firmware (BL31) */
-               secmon_reserved: secmon at 40000000 {
-                       reg = <0x0 0x40000000 0x0 0x80000>;
-                       no-map;
Quoted 8 lines

arch/arm/dts/sun50i-h616.dtsi line 65

Quoted 3 lines
arch/arm/dts/sun50i-h616.dtsi +0 -3
-               };
-       };
-  

As said always. it's better to not touch Linux dts files. If the same fix same available in Linux add SHA1 on the commit message otherwise keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar at least on sunxi.

this DT is not in Linux yet.
As this is a new SoC, we have to start at some point, and getting TF-A, Linux and U-Boot patches merged at the same time is virtually impossible. Ideally we have some bootloader support first, so that people can test the kernel patches, for instance.

So this DT is a tentative one, just here to make U-Boot happy. It is expected to change, and will be synced once it's merged into Linux.

As mentioned, the TF-A patches were changed after the U-Boot patches were merged, so this node was needed back then, but is obsolete now.

Cheers,
Andre