Move DRAM address of ATF
Subsystems (2)
cover Move DRAM address of ATF
Hello all,
Explanation for this series is mostly in [4/6]. First 3 patches should be safe to take independent of the last 3.
Thanks,
Andrew
Andrew Davis (6):
arm: mach-k3: Add default ATF location for AM62/AM62a
arm: mach-k3: Add config option for setting OP-TEE address
arm: mach-k3: am62: Enable OF_SYSTEM_SETUP for all boards
arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
arm: mach-k3: am62a: Fixup TF-A/OP-TEE reserved-memory node in FDT
arm: mach-k3: Move DRAM address of ATF for AM62/AM62a
arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 +- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 4 +- arch/arm/dts/k3-binman.dtsi | 8 +-- .../dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 +- arch/arm/mach-k3/Kconfig | 10 +++- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/am625_fdt.c | 2 + arch/arm/mach-k3/am62a7_fdt.c | 16 ++++++ arch/arm/mach-k3/am62ax/Kconfig | 1 + arch/arm/mach-k3/am62x/Kconfig | 3 ++ arch/arm/mach-k3/common_fdt.c | 52 +++++++++++++++++++ arch/arm/mach-k3/common_fdt.h | 2 + configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 2 - 17 files changed, 96 insertions(+), 17 deletions(-) create mode 100644 arch/arm/mach-k3/am62a7_fdt.c
Signature · 1 line
2.39.2
PATCH 1/6 arm: mach-k3: Add default ATF location for AM62/AM62a
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
--- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)
arch/arm/mach-k3/Kconfig +3 -2
@@ -123,10 +123,11 @@ config SYS_K3_SPL_ATF config K3_ATF_LOAD_ADDR hex "Load address of ATF image" + default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) default 0x70000000 help - The load address for the ATF image. This value defaults to 0x70000000 - if not provided in the board defconfig file. + The load address for the ATF image. This value is used to build the + FIT image header that places ATF in memory where it will run. config K3_DM_FW bool "Separate DM firmware image"
configs/am62ax_evm_a53_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM62A7=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM62A7_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000
configs/am62x_beagleplay_a53_defconfig +0 -1
@@ -6,7 +6,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM625_A53_BEAGLEPLAY=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
configs/am62x_evm_a53_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM625_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
configs/phycore_am62x_a53_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_PHYCORE_AM62X_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
configs/verdin-am62_a53_defconfig +0 -1
@@ -8,7 +8,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_VERDIN_AM62_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
Signature · 1 line
2.39.2
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
Hi Andrew
Quoted 86 lines · Andrew Davis
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>--- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)arch/arm/mach-k3/Kconfig +3
-2@@ -123,10 +123,11 @@ config SYS_K3_SPL_ATF config K3_ATF_LOAD_ADDR hex "Load address of ATF image" + default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) default 0x70000000 help - The load address for the ATF image. This value defaults to 0x70000000 - if not provided in the board defconfig file. + The load address for the ATF image. This value is used to build the + FIT image header that places ATF in memory where it will run. config K3_DM_FW bool "Separate DM firmware image"configs/am62ax_evm_a53_defconfig +0
-1@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM62A7=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM62A7_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000configs/am62x_beagleplay_a53_defconfig +0
-1@@ -6,7 +6,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM625_A53_BEAGLEPLAY=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000configs/am62x_evm_a53_defconfig +0
-1@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM625_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000configs/phycore_am62x_a53_defconfig +0
-1@@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_PHYCORE_AM62X_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000configs/verdin-am62_a53_defconfig +0
-0
configs/verdin-am62_a53_defconfig CONFIG_SPL_LIBCOMMON_SUPPORT=y · line 13
Quoted 7 lines
configs/verdin-am62_a53_defconfig +0
-1@@ -8,7 +8,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_VERDIN_AM62_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
Signature · 2 lines
Thanking You Neha Malcom Francis
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
In reply to Andrew DavisOn February 14, 2024 thus sayeth Andrew Davis:
Quoted 6 lines
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>
Quoted 14 lines
--- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)arch/arm/mach-k3/Kconfig +0
-0
arch/arm/mach-k3/Kconfig config SYS_K3_SPL_ATF · line 126
Quoted 4 lines
arch/arm/mach-k3/Kconfig +1
-0@@ -123,10 +123,11 @@ config SYS_K3_SPL_ATF config K3_ATF_LOAD_ADDR hex "Load address of ATF image" + default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7)
I went ahead an added this to the TODO for 62p's respin
~Bryan
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
In reply to Andrew DavisHi,
Quoted 6 lines · Andrew Davis
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>
Quoted 9 lines
--- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)
Beagleplay stops booting completely with latest U-boot so I did a little bisect and it seems like reverting this patch helps.
I am not sure what other implications there are of reverting this so I don't suggest immediately dropping it, however some hints around what's missing on beagleplay vs other platforms would be helpful.
Because other platforms based off the same SoC don't seem to be affected.
Signature · 2 lines
Best regards, Dhruva Gole <[email protected]>
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
Quoted 22 lines · Dhruva Gole
Hi,
Quoted 6 lines · Andrew Davis
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>Quoted 9 lines
--- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)Beagleplay stops booting completely with latest U-boot so I did a little bisect and it seems like reverting this patch helps.
Quoted 6 lines
I am not sure what other implications there are of reverting this so I don't suggest immediately dropping it, however some hints around what's missing on beagleplay vs other platforms would be helpful.
Because other platforms based off the same SoC don't seem to be affected.
Grumble... I had to rediscover this in parallel as well - Thanks Dhruva. mkimage -l tispl.bin and comparing with kernel log of reserved mem had me completely confused.
a) Memory maps are already notorious to manage on complex heterogenous systems. From beagle perspective, we have no need to go and monkey with DT defined memory map and DT should be the default and modifying DT should be explicitly called out with a log (instead of done "transparently") - so instead of CONFIG_K3_OPTEE_LOAD_ADDR default being forced from u-boot, it should be made optional, where when defined, it can overide the dt definition or some variant of that.
b) Looks like
https://lore.kernel.org/u-boot/[email protected]/
missed beagleplay? and we were in for a surprise there - i dont want to switch from default dts for beagleplay to something different just because of simplicity for users to know exactly the carveouts and with other s/w starting up on uC, dts is our "canonical truth".
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
Quoted 30 lines · Nishanth Menon
Quoted 22 lines · Dhruva Gole
Hi,
Quoted 6 lines · Andrew Davis
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>Quoted 9 lines
--- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)Beagleplay stops booting completely with latest U-boot so I did a little bisect and it seems like reverting this patch helps.
Quoted 6 lines
I am not sure what other implications there are of reverting this so I don't suggest immediately dropping it, however some hints around what's missing on beagleplay vs other platforms would be helpful.
Because other platforms based off the same SoC don't seem to be affected.
Quoted 7 lines
Grumble... I had to rediscover this in parallel as well - Thanks Dhruva. mkimage -l tispl.bin and comparing with kernel log of reserved mem had me completely confused.
a) Memory maps are already notorious to manage on complex heterogenous systems. From beagle perspective, we have no need to go and monkey with DT defined memory map and DT should be the default and modifying
Your DT source file is wrong, ATF is at 0x8000_0000 (or any address one wants to put in K3_ATF_LOAD_ADDR). DT doesn't "define" hardware, it "describes" it. ATF's location is dynamic and configurable, it doesn't belong in DT.
You have two options, either go update your DT, then update it again every time ATF moves. *OR* simply turn on OF_SYSTEM_SETUP and let U-Boot add the correct location reserved memory node for you.
Then you can also drop out the reserved-node from the DT template file. Only U-Boot knows where ATF is really placed in RAM, so U-Boot must add this info to DT.
Quoted 8 lines
DT should be explicitly called out with a log (instead of done "transparently") - so instead of
CONFIG_K3_OPTEE_LOAD_ADDRdefault being forced from u-boot, it should be made optional, where when defined, it can overide the dt definition or some variant of that.b) Looks like
https://lore.kernel.org/u-boot/[email protected]/
missed beagleplay? and we were in for a surprise there - i dont want
This was the only miss, OF_SYSTEM_SETUP didn't get added to the beagleplay config. Bryan just sent the fix for that now. I'll go look for a way to make this common across the whole SoC family so we don't again miss any new boards.
Andrew
Quoted 4 lines
to switch from default dts for beagleplay to something different just because of simplicity for users to know exactly the carveouts and with other s/w starting up on uC, dts is our "canonical truth".
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
Am 19.06.24 um 22:02 schrieb Andrew Davis:
Quoted 43 lines · Nishanth Menon
Quoted 30 lines · Dhruva Gole
Quoted 22 lines
Hi,
Quoted 6 lines · Andrew Davis
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>Quoted 9 lines
---
arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 -6 files changed, 3 insertions(+), 7 deletions(-)Beagleplay stops booting completely with latest U-boot so I did a little bisect and it seems like reverting this patch helps.
Quoted 6 lines
I am not sure what other implications there are of reverting this so I don't suggest immediately dropping it, however some hints around what's missing on beagleplay vs other platforms would be helpful.
Because other platforms based off the same SoC don't seem to be affected.
Quoted 7 lines
Grumble... I had to rediscover this in parallel as well - Thanks Dhruva. mkimage -l tispl.bin and comparing with kernel log of reserved mem had me completely confused.
a) Memory maps are already notorious to manage on complex heterogenous systems. From beagle perspective, we have no need to go and monkey with DT defined memory map and DT should be the default and modifying
Your DT source file is wrong, ATF is at 0x8000_0000 (or any address one wants to put in
K3_ATF_LOAD_ADDR). DT doesn't "define" hardware, it "describes" it. ATF's location is dynamic and configurable, it doesn't belong in DT.
Quoted 7 lines
You have two options, either go update your DT, then update it again every time ATF moves. *OR* simply turn on
OF_SYSTEM_SETUPand let U-Boot add the correct location reserved memory node for you.Then you can also drop out the reserved-node from the DT template file. Only U-Boot knows where ATF is really placed in RAM, so U-Boot must add this info to DT.
I think it is a good idea to remove the nodes from the device tree or at least mark them as "templates" and note that they are actually provided by the bootloader to make it less confusing.
Quoted 21 lines
Quoted 9 lines
DT should be explicitly called out with a log (instead of done "transparently") - so instead of
CONFIG_K3_OPTEE_LOAD_ADDRdefault being forced from u-boot, it should be made optional, where when defined, it can overide the dt definition or some variant of that.b) Looks like
https://lore.kernel.org/u-boot/[email protected]/
missed beagleplay? and we were in for a surprise there - i dont wantThis was the only miss,
OF_SYSTEM_SETUPdidn't get added to the beagleplay config. Bryan just sent the fix for that now. I'll go look for a way to make this common across the whole SoC family so we don't again miss any new boards.Andrew
Quoted 4 lines
to switch from default dts for beagleplay to something different just because of simplicity for users to know exactly the carveouts and with other s/w starting up on uC, dts is our "canonical truth".
Re: [PATCH 1/6] arm: mach-k3: Add default ATF location for AM62/AM62a
On June 20, 2024 thus sayeth Wadim Egorov:
Quoted 51 lines
Am 19.06.24 um 22:02 schrieb Andrew Davis:
Quoted 48 lines · Nishanth Menon
Quoted 30 lines · Dhruva Gole
Quoted 22 lines
Hi,
Quoted 6 lines · Andrew Davis
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices.
Signed-off-by Andrew Davis <[email protected]>Quoted 9 lines
---
arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 -6 files changed, 3 insertions(+), 7 deletions(-)Beagleplay stops booting completely with latest U-boot so I did a little bisect and it seems like reverting this patch helps.
Quoted 6 lines
I am not sure what other implications there are of reverting this so I don't suggest immediately dropping it, however some hints around what's missing on beagleplay vs other platforms would be helpful.
Because other platforms based off the same SoC don't seem to be affected.
Quoted 7 lines
Grumble... I had to rediscover this in parallel as well - Thanks Dhruva. mkimage -l tispl.bin and comparing with kernel log of reserved mem had me completely confused.
a) Memory maps are already notorious to manage on complex heterogenous systems. From beagle perspective, we have no need to go and monkey with DT defined memory map and DT should be the default and modifying
Your DT source file is wrong, ATF is at 0x8000_0000 (or any address one wants to put in
K3_ATF_LOAD_ADDR). DT doesn't "define" hardware, it "describes"
it. ATF's location is dynamic and configurable, it doesn't belong in DT.You have two options, either go update your DT, then update it again every time ATF moves. *OR* simply turn on
OF_SYSTEM_SETUPand let U-Boot add the correct location reserved memory node for you.
Quoted 8 lines
Quoted 3 lines
Then you can also drop out the reserved-node from the DT template file. Only U-Boot knows where ATF is really placed in RAM, so U-Boot must add this info to DT.
I think it is a good idea to remove the nodes from the device tree or at least mark them as "templates" and note that they are actually provided by the bootloader to make it less confusing.
I have a patch lined up for this. My hope was we could remove all memory nodes completely from the kernel and have U-Boot fix these up. It's initialize DDR knows about capacity, inline ECC, and trowing all the different binaries into it.
Our memory{} node fixup isn't ready yet unfortunately so I think just the reserved-memory{} node can be ripped out for now.
~Bryan
Quoted 22 lines
Quoted 22 lines
Quoted 10 lines
DT should be explicitly called out with a log (instead of done "transparently") - so instead of
CONFIG_K3_OPTEE_LOAD_ADDRdefault being forced from u-boot, it should be made optional, where when defined, it can overide the dt definition or some variant of that.b) Looks like
https://lore.kernel.org/u-boot/[email protected]/
missed beagleplay? and we were in for a surprise there - i dont wantThis was the only miss,
OF_SYSTEM_SETUPdidn't get added to the beagleplay config. Bryan just sent the fix for that now. I'll go look for a way to make this common across the whole SoC family so we don't again miss any new boards.Andrew
Quoted 4 lines
to switch from default dts for beagleplay to something different just because of simplicity for users to know exactly the carveouts and with other s/w starting up on uC, dts is our "canonical truth".
PATCH 2/6 arm: mach-k3: Add config option for setting OP-TEE address
In reply to Andrew DavisMuch like we have for ATF, OP-TEE has a standard address that we load it too and run it from. Add a Kconfig item for this to remove some hard-coding and allow this address to be more easily changed.
--- arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 ++-- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 4 ++-- arch/arm/dts/k3-binman.dtsi | 8 ++++---- arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 ++-- arch/arm/mach-k3/Kconfig | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-)
arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +2 -2
@@ -105,8 +105,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };
arch/arm/dts/k3-am65-iot2050-boot-image.dtsi +2 -2
@@ -51,8 +51,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { }; };
arch/arm/dts/k3-binman.dtsi +4 -4
@@ -286,8 +286,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; ti-secure { content = <&tee>; keyfile = "custMpk.pem";
@@ -356,8 +356,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };
arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi +2 -2
@@ -250,8 +250,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };
arch/arm/mach-k3/Kconfig +7 -0
@@ -129,6 +129,13 @@ config K3_ATF_LOAD_ADDR The load address for the ATF image. This value is used to build the FIT image header that places ATF in memory where it will run. +config K3_OPTEE_LOAD_ADDR + hex "Load address of OPTEE image" + default 0x9e800000 + help + The load address for the OPTEE image. This value defaults to 0x9e800000 + if not provided in the board defconfig file. + config K3_DM_FW bool "Separate DM firmware image" depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
Signature · 1 line
2.39.2
Re: [PATCH 2/6] arm: mach-k3: Add config option for setting OP-TEE address
Quoted 92 lines · Andrew Davis
Much like we have for ATF, OP-TEE has a standard address that we load it too and run it from. Add a
Kconfigitem for this to remove some hard-coding and allow this address to be more easily changed.Signed-off-by Andrew Davis <[email protected]>--- arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 ++-- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 4 ++-- arch/arm/dts/k3-binman.dtsi | 8 ++++---- arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 ++-- arch/arm/mach-k3/Kconfig | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-)arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +2
-2@@ -105,8 +105,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/dts/k3-am65-iot2050-boot-image.dtsi +2
-2@@ -51,8 +51,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { }; };arch/arm/dts/k3-binman.dtsi +4
-4@@ -286,8 +286,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; ti-secure { content = <&tee>; keyfile = "custMpk.pem";@@ -356,8 +356,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi +2
-2@@ -250,8 +250,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/mach-k3/Kconfig +0
-0@@ -129,6 +129,13 @@ config K3_ATF_LOAD_ADDR The load address for the ATF image. This value is used to build the FIT image header that places ATF in memory where it will run.
arch/arm/mach-k3/Kconfig config K3_ATF_LOAD_ADDR · line 141
Quoted 10 lines
arch/arm/mach-k3/Kconfig +7
-0+config K3_OPTEE_LOAD_ADDR + hex "Load address of OPTEE image" + default 0x9e800000 + help + The load address for the OPTEE image. This value defaults to 0x9e800000 + if not provided in the board defconfig file. + config K3_DM_FW bool "Separate DM firmware image" depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
Signature · 2 lines
Thanking You Neha Malcom Francis
Re: [PATCH 2/6] arm: mach-k3: Add config option for setting OP-TEE address
In reply to Andrew DavisHi Andrew,
Quoted 89 lines · Andrew Davis
Much like we have for ATF, OP-TEE has a standard address that we load it too and run it from. Add a
Kconfigitem for this to remove some hard-coding and allow this address to be more easily changed.Signed-off-by Andrew Davis <[email protected]>--- arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 ++-- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 4 ++-- arch/arm/dts/k3-binman.dtsi | 8 ++++---- arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 ++-- arch/arm/mach-k3/Kconfig | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-)arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +2
-2@@ -105,8 +105,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/dts/k3-am65-iot2050-boot-image.dtsi +2
-2@@ -51,8 +51,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { }; };arch/arm/dts/k3-binman.dtsi +4
-4@@ -286,8 +286,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; ti-secure { content = <&tee>; keyfile = "custMpk.pem";@@ -356,8 +356,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi +2
-2@@ -250,8 +250,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/mach-k3/Kconfig +0
-0
arch/arm/mach-k3/Kconfig config K3_ATF_LOAD_ADDR · line 138
Quoted 10 lines
arch/arm/mach-k3/Kconfig +7
-0@@ -129,6 +129,13 @@ config K3_ATF_LOAD_ADDR The load address for the ATF image. This value is used to build the FIT image header that places ATF in memory where it will run. +config K3_OPTEE_LOAD_ADDR + hex "Load address of OPTEE image" + default 0x9e800000 + help + The load address for the OPTEE image. This value defaults to 0x9e800000 + if not provided in the board defconfig file. +
Wondering if we should call out updating the firewall configurations as well as a part of this so people don't end up with random failures..
Regards,
Manorit
Quoted 6 lines
arch/arm/mach-k3/Kconfig +0
-0config K3_DM_FW bool "Separate DM firmware image" depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAINSignature · 1 line
2.39.2
Re: [PATCH 2/6] arm: mach-k3: Add config option for setting OP-TEE address
Quoted 95 lines · Manorit Chawdhry
Hi Andrew,
Quoted 92 lines · Andrew Davis
Much like we have for ATF, OP-TEE has a standard address that we load it too and run it from. Add a
Kconfigitem for this to remove some hard-coding and allow this address to be more easily changed.Signed-off-by Andrew Davis <[email protected]>--- arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 ++-- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 4 ++-- arch/arm/dts/k3-binman.dtsi | 8 ++++---- arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 ++-- arch/arm/mach-k3/Kconfig | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-)arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +2
-2@@ -105,8 +105,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/dts/k3-am65-iot2050-boot-image.dtsi +2
-2@@ -51,8 +51,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { }; };arch/arm/dts/k3-binman.dtsi +4
-4@@ -286,8 +286,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; ti-secure { content = <&tee>; keyfile = "custMpk.pem";@@ -356,8 +356,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi +2
-2@@ -250,8 +250,8 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = <0x9e800000>; - entry = <0x9e800000>; + load = <CONFIG_K3_OPTEE_LOAD_ADDR>; + entry = <CONFIG_K3_OPTEE_LOAD_ADDR>; tee-os { filename = "tee-raw.bin"; };arch/arm/mach-k3/Kconfig +0
-0@@ -129,6 +129,13 @@ config K3_ATF_LOAD_ADDR The load address for the ATF image. This value is used to build the FIT image header that places ATF in memory where it will run.
Quoted 11 lines
arch/arm/mach-k3/Kconfig config K3_ATF_LOAD_ADDR · line 138
Quoted 7 lines
arch/arm/mach-k3/Kconfig +7
-0+config K3_OPTEE_LOAD_ADDR + hex "Load address of OPTEE image" + default 0x9e800000 + help + The load address for the OPTEE image. This value defaults to 0x9e800000 + if not provided in the board defconfig file. +Wondering if we should call out updating the firewall configurations as well as a part of this so people don't end up with random failures..
Might be even better to build the firewall config based on this new kconfig symbol. I can look into that at some later point.
Andrew
Quoted 9 lines
Regards,
ManoritQuoted 6 lines
arch/arm/mach-k3/Kconfig +0
-0config K3_DM_FW bool "Separate DM firmware image" depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAINSignature · 1 line
2.39.2
Re: [PATCH 2/6] arm: mach-k3: Add config option for setting OP-TEE address
In reply to Andrew DavisOn February 14, 2024 thus sayeth Andrew Davis:
Quoted 5 lines
Much like we have for ATF, OP-TEE has a standard address that we load it too and run it from. Add a
Kconfigitem for this to remove some hard-coding and allow this address to be more easily changed.Signed-off-by Andrew Davis <[email protected]>
~Bryan
PATCH 3/6 arm: mach-k3: am62: Enable OF_SYSTEM_SETUP for all boards
In reply to Andrew DavisThe fixups provided by ft_system_setup() are applicable for all AM62 based boards. Select this at the target selection level for all AM62 boards and remove it from any specific defconfig.
--- arch/arm/mach-k3/am62x/Kconfig | 3 +++ configs/verdin-am62_a53_defconfig | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-k3/am62x/Kconfig +3 -0
@@ -13,6 +13,7 @@ config TARGET_AM625_A53_EVM bool "TI K3 based AM625 EVM running on A53" select ARM64 select BINMAN + select OF_SYSTEM_SETUP config TARGET_AM625_R5_EVM bool "TI K3 based AM625 EVM running on R5"
@@ -29,6 +30,7 @@ config TARGET_PHYCORE_AM62X_A53 bool "PHYTEC phyCORE-AM62x running on A53" select ARM64 select BINMAN + select OF_SYSTEM_SETUP config TARGET_PHYCORE_AM62X_R5 bool "PHYTEC phyCORE-AM62x running on R5"
@@ -45,6 +47,7 @@ config TARGET_VERDIN_AM62_A53 bool "Toradex Verdin AM62 running on A53" select ARM64 select BINMAN + select OF_SYSTEM_SETUP config TARGET_VERDIN_AM62_R5 bool "Toradex Verdin AM62 running on R5"
configs/verdin-am62_a53_defconfig +0 -1
@@ -37,7 +37,6 @@ CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_SYS_BOOTM_LEN=0x40000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 -CONFIG_OF_SYSTEM_SETUP=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile k3-am625-verdin-${variant}-${fdt_board}.dtb" CONFIG_LOG=y
Signature · 1 line
2.39.2
PATCH 4/6 arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
In reply to Andrew DavisThe address we load TF-A and OP-TEE to is configurable by Kconfig CONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.
If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Add this fixup function, and enable it for AM62.
--- arch/arm/mach-k3/am625_fdt.c | 2 ++ arch/arm/mach-k3/common_fdt.c | 52 +++++++++++++++++++++++++++++++++++ arch/arm/mach-k3/common_fdt.h | 2 ++ 3 files changed, 56 insertions(+)
arch/arm/mach-k3/am625_fdt.c +2 -0
@@ -43,6 +43,8 @@ int ft_system_setup(void *blob, struct bd_info *bd)fdt_fixup_cores_nodes_am625 (blob,k3_get_core_nr ());fdt_fixup_gpu_nodes_am625 (blob,k3_has_gpu ());fdt_fixup_pru_node_am625 (blob,k3_has_pru ()); +fdt_fixup_reserved (blob,"tfa" ,CONFIG_K3_ATF_LOAD_ADDR ,0x80000 ); +fdt_fixup_reserved (blob,"optee" ,CONFIG_K3_OPTEE_LOAD_ADDR ,0x1800000 );return 0 ; }
arch/arm/mach-k3/common_fdt.c +52 -0
55 lines not on this page · raw message
arch/arm/mach-k3/common_fdt.h +2 -0
@@ -8,5 +8,7 @@int fdt_fixup_msmc_ram_k3 (void *blob);int fdt_del_node_path (void *blob,const char *path); +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size);#endif /* _COMMON_FDT_H */
Signature · 1 line
2.39.2
Re: [PATCH 4/6] arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
Hi Andrew
Quoted 98 lines · Andrew Davis
The address we load TF-A and OP-TEE to is configurable by
KconfigCONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Add this fixup function, and enable it for AM62.
Signed-off-by Andrew Davis <[email protected]>--- arch/arm/mach-k3/am625_fdt.c | 2 ++ arch/arm/mach-k3/common_fdt.c | 52 +++++++++++++++++++++++++++++++++++ arch/arm/mach-k3/common_fdt.h | 2 ++ 3 files changed, 56 insertions(+)arch/arm/mach-k3/am625_fdt.c +2
-0@@ -43,6 +43,8 @@ int ft_system_setup(void *blob, struct bd_info *bd)fdt_fixup_cores_nodes_am625 (blob,k3_get_core_nr ());fdt_fixup_gpu_nodes_am625 (blob,k3_has_gpu ());fdt_fixup_pru_node_am625 (blob,k3_has_pru ()); +fdt_fixup_reserved (blob,"tfa" ,CONFIG_K3_ATF_LOAD_ADDR ,0x80000 ); +fdt_fixup_reserved (blob,"optee" ,CONFIG_K3_OPTEE_LOAD_ADDR ,0x1800000 );return 0 ; }arch/arm/mach-k3/common_fdt.c +52
-0@@ -112,3 +112,55 @@ int fdt_del_node_path(void *blob, const char *path)return ret; } + +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size) +{ +int nodeoffset, subnode; +int ret; + +/* Find reserved-memory */ + nodeoffset =fdt_subnode_offset (blob,0 ,"reserved-memory" ); +if (nodeoffset <0 ) { +debug ("Could not find reserved-memory node\n" ); +return 0 ; + } + +/* Find existing matching subnode and remove it */ +fdt_for_each_subnode (subnode, blob, nodeoffset) { +const char *node_name; +fdt_addr_t addr; +fdt_size_t size; + +/* Name matching */ + node_name =fdt_get_name (blob, subnode,NULL ); +if (!name) +return -EINVAL ; +if (!strncmp (node_name, name,strlen (name))) { +/* Read out old size first */ + addr =fdtdec_get_addr_size (blob, subnode,"reg" , &size); +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + new_size = size; + +/* Delete node */ + ret =fdt_del_node (blob, subnode); +if (ret <0 ) +return ret; + +/* Only one matching node */ +break ; + } + } + +struct fdt_memory carveout = { + .start = new_address, + .end = new_address + new_size -1 , + }; + ret =fdtdec_add_reserved_memory (blob, name, &carveout,NULL ,0 ,NULL , +FDTDEC_RESERVED_MEMORY_NO_MAP ); +if (ret <0 ) +return ret; + +return 0 ; +}arch/arm/mach-k3/common_fdt.h +0
-0
arch/arm/mach-k3/common_fdt.h line 14
Quoted 7 lines
arch/arm/mach-k3/common_fdt.h +2
-0@@ -8,5 +8,7 @@int fdt_fixup_msmc_ram_k3 (void *blob);int fdt_del_node_path (void *blob,const char *path); +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size);#endif /* _COMMON_FDT_H */
This looks pretty neat! Thanks!
Signature · 2 lines
Thanking You Neha Malcom Francis
Re: [PATCH 4/6] arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
In reply to Andrew DavisHi Andrew,
Quoted 6 lines · Andrew Davis
The address we load TF-A and OP-TEE to is configurable by
KconfigCONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.
Quoted 6 lines
If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Add this fixup function, and enable it for AM62.
Why are we doing it only for AM62? Assuming that this can help in other devices as well as all the DTs ideally should have these reserved nodes in DT?
Regards,
Manorit
Quoted 96 lines
Signed-off-by Andrew Davis <[email protected]>--- arch/arm/mach-k3/am625_fdt.c | 2 ++ arch/arm/mach-k3/common_fdt.c | 52 +++++++++++++++++++++++++++++++++++ arch/arm/mach-k3/common_fdt.h | 2 ++ 3 files changed, 56 insertions(+)arch/arm/mach-k3/am625_fdt.c +2
-0@@ -43,6 +43,8 @@ int ft_system_setup(void *blob, struct bd_info *bd)fdt_fixup_cores_nodes_am625 (blob,k3_get_core_nr ());fdt_fixup_gpu_nodes_am625 (blob,k3_has_gpu ());fdt_fixup_pru_node_am625 (blob,k3_has_pru ()); +fdt_fixup_reserved (blob,"tfa" ,CONFIG_K3_ATF_LOAD_ADDR ,0x80000 ); +fdt_fixup_reserved (blob,"optee" ,CONFIG_K3_OPTEE_LOAD_ADDR ,0x1800000 );return 0 ; }arch/arm/mach-k3/common_fdt.c +52
-0@@ -112,3 +112,55 @@ int fdt_del_node_path(void *blob, const char *path)return ret; } + +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size) +{ +int nodeoffset, subnode; +int ret; + +/* Find reserved-memory */ + nodeoffset =fdt_subnode_offset (blob,0 ,"reserved-memory" ); +if (nodeoffset <0 ) { +debug ("Could not find reserved-memory node\n" ); +return 0 ; + } + +/* Find existing matching subnode and remove it */ +fdt_for_each_subnode (subnode, blob, nodeoffset) { +const char *node_name; +fdt_addr_t addr; +fdt_size_t size; + +/* Name matching */ + node_name =fdt_get_name (blob, subnode,NULL ); +if (!name) +return -EINVAL ; +if (!strncmp (node_name, name,strlen (name))) { +/* Read out old size first */ + addr =fdtdec_get_addr_size (blob, subnode,"reg" , &size); +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + new_size = size; + +/* Delete node */ + ret =fdt_del_node (blob, subnode); +if (ret <0 ) +return ret; + +/* Only one matching node */ +break ; + } + } + +struct fdt_memory carveout = { + .start = new_address, + .end = new_address + new_size -1 , + }; + ret =fdtdec_add_reserved_memory (blob, name, &carveout,NULL ,0 ,NULL , +FDTDEC_RESERVED_MEMORY_NO_MAP ); +if (ret <0 ) +return ret; + +return 0 ; +}arch/arm/mach-k3/common_fdt.h +2
-0@@ -8,5 +8,7 @@int fdt_fixup_msmc_ram_k3 (void *blob);int fdt_del_node_path (void *blob,const char *path); +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size);#endif /* _COMMON_FDT_H */ Signature · 1 line
2.39.2
Re: [PATCH 4/6] arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
Quoted 14 lines · Manorit Chawdhry
Hi Andrew,
Quoted 11 lines · Andrew Davis
The address we load TF-A and OP-TEE to is configurable by
KconfigCONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Quoted 5 lines
Quoted 1 line
Add this fixup function, and enable it for AM62.
Why are we doing it only for AM62? Assuming that this can help in other devices as well as all the DTs ideally should have these reserved nodes in DT?
Only AM62(a) have TF-A in DRAM, the rest of K3 put it in SRAM which means it wont need to be moved currently. If we ever do move TF-A to DRAM for other devices then they could make use of this helper function just the same.
Andrew
Quoted 99 lines
Regards,
ManoritQuoted 96 lines
Signed-off-by Andrew Davis <[email protected]>--- arch/arm/mach-k3/am625_fdt.c | 2 ++ arch/arm/mach-k3/common_fdt.c | 52 +++++++++++++++++++++++++++++++++++ arch/arm/mach-k3/common_fdt.h | 2 ++ 3 files changed, 56 insertions(+)arch/arm/mach-k3/am625_fdt.c +2
-0@@ -43,6 +43,8 @@ int ft_system_setup(void *blob, struct bd_info *bd)fdt_fixup_cores_nodes_am625 (blob,k3_get_core_nr ());fdt_fixup_gpu_nodes_am625 (blob,k3_has_gpu ());fdt_fixup_pru_node_am625 (blob,k3_has_pru ()); +fdt_fixup_reserved (blob,"tfa" ,CONFIG_K3_ATF_LOAD_ADDR ,0x80000 ); +fdt_fixup_reserved (blob,"optee" ,CONFIG_K3_OPTEE_LOAD_ADDR ,0x1800000 );return 0 ; }arch/arm/mach-k3/common_fdt.c +52
-0@@ -112,3 +112,55 @@ int fdt_del_node_path(void *blob, const char *path)return ret; } + +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size) +{ +int nodeoffset, subnode; +int ret; + +/* Find reserved-memory */ + nodeoffset =fdt_subnode_offset (blob,0 ,"reserved-memory" ); +if (nodeoffset <0 ) { +debug ("Could not find reserved-memory node\n" ); +return 0 ; + } + +/* Find existing matching subnode and remove it */ +fdt_for_each_subnode (subnode, blob, nodeoffset) { +const char *node_name; +fdt_addr_t addr; +fdt_size_t size; + +/* Name matching */ + node_name =fdt_get_name (blob, subnode,NULL ); +if (!name) +return -EINVAL ; +if (!strncmp (node_name, name,strlen (name))) { +/* Read out old size first */ + addr =fdtdec_get_addr_size (blob, subnode,"reg" , &size); +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + new_size = size; + +/* Delete node */ + ret =fdt_del_node (blob, subnode); +if (ret <0 ) +return ret; + +/* Only one matching node */ +break ; + } + } + +struct fdt_memory carveout = { + .start = new_address, + .end = new_address + new_size -1 , + }; + ret =fdtdec_add_reserved_memory (blob, name, &carveout,NULL ,0 ,NULL , +FDTDEC_RESERVED_MEMORY_NO_MAP ); +if (ret <0 ) +return ret; + +return 0 ; +}arch/arm/mach-k3/common_fdt.h +2
-0@@ -8,5 +8,7 @@int fdt_fixup_msmc_ram_k3 (void *blob);int fdt_del_node_path (void *blob,const char *path); +int fdt_fixup_reserved (void *blob,const char *name, +unsigned int new_address,unsigned int new_size);#endif /* _COMMON_FDT_H */ Signature · 1 line
2.39.2
Re: [PATCH 4/6] arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
In reply to Andrew DavisOn February 14, 2024 thus sayeth Andrew Davis:
Quoted 6 lines
The address we load TF-A and OP-TEE to is configurable by
KconfigCONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.
Quoted 8 lines
If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Add this fixup function, and enable it for AM62.
Signed-off-by Andrew Davis <[email protected]>
Does this mean we need to no-map these regions in the MMU as well? Right now it's just statically defined. I was looking into trying to read the reserved-memory{} node to see if we could dynamically build the MMU config but that would have to happen after this step right?
~Bryan
Re: [PATCH 4/6] arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
Quoted 14 lines · Bryan Brattlof
On February 14, 2024 thus sayeth Andrew Davis:
Quoted 13 lines
The address we load TF-A and OP-TEE to is configurable by
KconfigCONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Add this fixup function, and enable it for AM62.
Quoted 9 lines
Quoted 1 line
Signed-off-by Andrew Davis <[email protected]>Acked-by Bryan Brattlof <[email protected]>Does this mean we need to no-map these regions in the MMU as well? Right now it's just statically defined. I was looking into trying to read the reserved-memory{} node to see if we could dynamically build the MMU config but that would have to happen after this step right?
Good question. So TF-A/OP-TEE are loaded by R5 SPL, which means by the time A53 SPL starts they are already in place and firewalled, which means yes we should no-map them in MMU to prevent some speculative fetch (A53 doesn't do that, but A72 on other K3 device might) or similar from causing a firewall exception.
The fixup in this patch is done to the Linux DT file right before it is handed off to Linux, which as you point out happens after we setup the U-Boot MMU.
This is more a problem in theory, but not really one in practice. I know, I don't like that answer either, but I can't think of a better solution outside of doing this fixup in R5 SPL to the U-Boot DTB also. (Which might work, but seems overkill)..
Andrew
Quoted 1 line
~Bryan
Re: [PATCH 4/6] arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
On March 6, 2024 thus sayeth Andrew Davis:
Quoted 31 lines · Bryan Brattlof
Quoted 14 lines
On February 14, 2024 thus sayeth Andrew Davis:
Quoted 13 lines
The address we load TF-A and OP-TEE to is configurable by
KconfigCONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are often statically defined. As these binaries are dynamically loadable, and in the case of OP-TEE may not even be loaded at all, hard-coding these addresses is not a hardware description, but rather a configuration.If the address that U-Boot loaded TF-A or OP-TEE does not match the address in hard-coded in DT, then fix that node address. This also handles the case when no reserved memory for these is provided by DT, which is more correct as explained above.
Add this fixup function, and enable it for AM62.
Quoted 9 lines
Quoted 1 line
Signed-off-by Andrew Davis <[email protected]>Acked-by Bryan Brattlof <[email protected]>Does this mean we need to no-map these regions in the MMU as well? Right now it's just statically defined. I was looking into trying to read the reserved-memory{} node to see if we could dynamically build the MMU config but that would have to happen after this step right?
Good question. So TF-A/OP-TEE are loaded by R5 SPL, which means by the time A53 SPL starts they are already in place and firewalled, which means yes we should no-map them in MMU to prevent some speculative fetch (A53 doesn't do that, but A72 on other K3 device might) or similar from causing a firewall exception.
Quoted 9 lines
The fixup in this patch is done to the Linux DT file right before it is handed off to Linux, which as you point out happens after we setup the U-Boot MMU.
This is more a problem in theory, but not really one in practice. I know, I don't like that answer either, but I can't think of a better solution outside of doing this fixup in R5 SPL to the U-Boot DTB also. (Which might work, but seems overkill)..
Ah that's a good point. Only the SoCs with A53s are using DRAM for TFA so we should be good for now :)
Thanks Andrew
Quoted 3 lines
Andrew
Quoted 1 line
~Bryan
PATCH 5/6 arm: mach-k3: am62a: Fixup TF-A/OP-TEE reserved-memory node in FDT
In reply to Andrew DavisThe address we load TFA and OP-TEE to is configurable by CONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are static. Fix that by updating this node when the loaded address does not match the address in DT.
--- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/am62a7_fdt.c | 16 ++++++++++++++++ arch/arm/mach-k3/am62ax/Kconfig | 1 + 3 files changed, 18 insertions(+) create mode 100644 arch/arm/mach-k3/am62a7_fdt.c
arch/arm/mach-k3/Makefile +1 -0
@@ -12,6 +12,7 @@ obj-$(CONFIG_SOC_K3_AM654) += am654_fdt.o obj-$(CONFIG_SOC_K3_J721E) += j721e_fdt.o obj-$(CONFIG_SOC_K3_J721S2) += j721s2_fdt.o obj-$(CONFIG_SOC_K3_AM625) += am625_fdt.o +obj-$(CONFIG_SOC_K3_AM62A7) += am62a7_fdt.o endif ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_SOC_K3_AM654) += am654_init.o
arch/arm/mach-k3/am62a7_fdt.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/ +*/ + +#include <asm/hardware.h> +#include "common_fdt.h" +#include <fdt_support.h> + +int ft_system_setup (void *blob,struct bd_info *bd) +{ +fdt_fixup_reserved (blob,"tfa" ,CONFIG_K3_ATF_LOAD_ADDR ,0x80000 ); +fdt_fixup_reserved (blob,"optee" ,CONFIG_K3_OPTEE_LOAD_ADDR ,0x1800000 ); + +return 0 ; +}
arch/arm/mach-k3/am62ax/Kconfig +1 -0
@@ -13,6 +13,7 @@ config TARGET_AM62A7_A53_EVM bool "TI K3 based AM62A7 EVM running on A53" select ARM64 select BINMAN + select OF_SYSTEM_SETUP imply BOARD imply SPL_BOARD imply TI_I2C_BOARD_DETECT
Signature · 1 line
2.39.2
Re: [PATCH 5/6] arm: mach-k3: am62a: Fixup TF-A/OP-TEE reserved-memory node in FDT
On February 14, 2024 thus sayeth Andrew Davis:
Quoted 6 lines
The address we load TFA and OP-TEE to is configurable by CONFIG_K3_{ATF,OPTEE}_LOAD_ADDR, but the DT nodes reserving this memory are static. Fix that by updating this node when the loaded address does not match the address in DT.
Signed-off-by Andrew Davis <[email protected]>
~Bryan
PATCH 6/6 arm: mach-k3: Move DRAM address of ATF for AM62/AM62a
In reply to Andrew DavisThe current address of TF-A in DRAM is just below the 512MB address line. This means if the DRAM in a system is 512MB then TF-A is right at the end of memory which is often reused, for instance U-Boot relocates itself here. If a system has less than 512MB then that system wouldn't work at all as TF-A would fail to load.
To avoid the issues above, move TF-A to the start of DRAM, which doesn't change from system to system.
As TF-A is position independent, this has no dependency on TF-A. We also fixup DT as needed when TF-A address is moved, so this change also has no dependency on Linux and is fully forward/backward compatible.
--- arch/arm/mach-k3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-k3/Kconfig +1 -1
@@ -123,7 +123,7 @@ config SYS_K3_SPL_ATF config K3_ATF_LOAD_ADDR hex "Load address of ATF image" - default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) + default 0x80000000 if (SOC_K3_AM625 || SOC_K3_AM62A7) default 0x70000000 help The load address for the ATF image. This value is used to build the
Signature · 1 line
2.39.2
Re: [PATCH 6/6] arm: mach-k3: Move DRAM address of ATF for AM62/AM62a
Hello Andrew,
thanks for this series.
Quoted 5 lines · Andrew Davis
The current address of TF-A in DRAM is just below the 512MB address line. This means if the DRAM in a system is 512MB then TF-A is right at the end of memory which is often reused, for instance U-Boot relocates itself here. If a system has less than 512MB then that system wouldn't work at all as TF-A would fail to load.
Do you expect issue with system with exactly 512MB of RAM? We have such a board available and this is something that was not on our radar.
The way we handle this is with verdin-am62.c:board_get_usable_ram_top()
There is also some other reserved memory just before the 512MB limit, not just the TF-A.
Francesco
Re: [PATCH 6/6] arm: mach-k3: Move DRAM address of ATF for AM62/AM62a
Quoted 4 lines · Francesco Dolcini
Hello Andrew,
thanks for this series.On Wed, Feb 14, 2024 at 10:30:09AM -0600, Andrew Davis wrote:
Quoted 8 lines
Quoted 5 lines
The current address of TF-A in DRAM is just below the 512MB address line. This means if the DRAM in a system is 512MB then TF-A is right at the end of memory which is often reused, for instance U-Boot relocates itself here. If a system has less than 512MB then that system wouldn't work at all as TF-A would fail to load.
Do you expect issue with system with exactly 512MB of RAM? We have such a board available and this is something that was not on our radar.
The issues with exactly 512MB are much less than the systems with less. Mostly small software issues like the one you work around below with U-Boot relocation.
Quoted 3 lines
The way we handle this is with
verdin-am62.c:board_get_usable_ram_top()
The point of this patch is to avoid the need for workarounds like that in the first place.
Quoted 2 lines
There is also some other reserved memory just before the 512MB limit, not just the TF-A.
This series prepares for also moving OP-TEE at some point (which will be a bit more involved as it still needs to be made position independent). The other reserved memory is mostly for remoteproc firmware which should be made dynamic instead of hard-coding memory carve-outs for their use.
Andrew
Quoted 3 lines
Francesco
Re: [PATCH 6/6] arm: mach-k3: Move DRAM address of ATF for AM62/AM62a
In reply to Andrew DavisOn February 14, 2024 thus sayeth Andrew Davis:
Quoted 6 lines
The current address of TF-A in DRAM is just below the 512MB address line. This means if the DRAM in a system is 512MB then TF-A is right at the end of memory which is often reused, for instance U-Boot relocates itself here. If a system has less than 512MB then that system wouldn't work at all as TF-A would fail to load.
Quoted 8 lines
To avoid the issues above, move TF-A to the start of DRAM, which doesn't change from system to system.
As TF-A is position independent, this has no dependency on TF-A. We also fixup DT as needed when TF-A address is moved, so this change also has no dependency on Linux and is fully forward/backward compatible.
Signed-off-by Andrew Davis <[email protected]>
Thanks for this! This will make adding SIP support much easier.
~Bryan
Quoted 20 lines
--- arch/arm/mach-k3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-k3/Kconfig +1
-1@@ -123,7 +123,7 @@ config SYS_K3_SPL_ATF config K3_ATF_LOAD_ADDR hex "Load address of ATF image" - default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) + default 0x80000000 if (SOC_K3_AM625 || SOC_K3_AM62A7) default 0x70000000 help The load address for the ATF image. This value is used to build theSignature · 1 line
2.39.2
Quoted 14 lines · Andrew Davis
Explanation for this series is mostly in [4/6]. First 3 patches should be safe to take independent of the last 3.
Thanks,
AndrewAndrew Davis (6):
arm: mach-k3: Add default ATF location for AM62/AM62a
arm: mach-k3: Add config option for setting OP-TEE address
arm: mach-k3: am62: EnableOF_SYSTEM_SETUPfor all boards
arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT
arm: mach-k3: am62a: Fixup TF-A/OP-TEE reserved-memory node in FDT
arm: mach-k3: Move DRAM address of ATF for AM62/AM62a
Quoted 1 line
[...]
Applied to u-boot/next, thanks!
Signature · 1 line
Tom