Add falcon support for am62a, 62p and 62x
Subsystems (2)
cover Add falcon support for am62a, 62p and 62x
This patch set adds support for falcon boot on AM62a, 62p and 62x by bypassing A53 SPL and U-boot.
Existing Boot flow:
R5 SPL -> ATF -> A53 SPL -> U-Boot -> Linux Kernel
Updated flow:
R5 SPL -> ATF -> Linux Kernel
U-boot's falcon flow expects the jump from SPL to kernel to happen on the same core which is not directly applicable for our heterogeneous platforms since ATF, OPTEE and other non SPL binaries from tispl.bin should be loaded before the kernel by the R5 SPL.
So we have to use a non std flow to bypass A53 SPL and U-Boot, we first load the newly added tispl_falcon.bin instead of tispl.bin which lacks u-boot-spl.bin (A53's SPL) and the corresponding fdt. This sets up dm, tifs, optee and atf. Once loaded, we load the kernel and the dtb (with fixups) at ATF's PRELOADED_BL33_BASE and K3_HW_CONFIG_BASE.
NOTE:
Since we're now using the SPL to load the kernel and kernel expects a 2MiB aligned load address, the existing PRELOADED_BL33_BASE has to be changed for ATF to 0x80200000.
This patch depends on the patch 'spl: return header size to spl_load in os boot'[0].
[0]: https://lore.kernel.org/u-boot/[email protected]/
---
Anshul Dalal (10):
spl: Kconfig: allow K3 devices to use falcon mode
cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
mach-k3: fix reading size and addr from fdt on R5
arm: dts: am62a: allow booting from eMMC
arch: arm: k3-binman: add fit for falcon boot
mach-k3: add eMMC FS boot support for am62[ap]
mach-k3: sysfw-loader: update img_hdr for falcon
configs: ti_armv7_common: add cfgs for SPI falcon boot
config: add falcon boot config fragment for am62x
mach-k3: common: add falcon support for 62[axp]
arch/arm/dts/k3-am625-sk-binman.dtsi | 64 ++++++++++++++++ arch/arm/dts/k3-am62a-sk-binman.dtsi | 64 ++++++++++++++++ arch/arm/dts/k3-am62a7-sk-u-boot.dtsi | 4 + arch/arm/dts/k3-am62p-sk-binman.dtsi | 51 +++++++++++++ arch/arm/dts/k3-binman.dtsi | 53 +++++++++++++ arch/arm/mach-k3/am62ax/am62a7_init.c | 4 + arch/arm/mach-k3/am62px/am62p5_init.c | 4 + arch/arm/mach-k3/common.c | 105 ++++++++++++++++++++++++++ arch/arm/mach-k3/common_fdt.c | 4 +- arch/arm/mach-k3/r5/sysfw-loader.c | 6 +- cmd/Kconfig | 2 +- common/spl/Kconfig | 3 +- configs/am62x_r5_falcon.config | 30 ++++++++ include/configs/ti_armv7_common.h | 6 ++ 14 files changed, 396 insertions(+), 4 deletions(-) create mode 100644 configs/am62x_r5_falcon.config
Signature · 1 line
2.43.0
PATCH 1/10 spl: Kconfig: allow K3 devices to use falcon mode
Falcon mode was disabled for TI_SECURE_DEVICE at commit e95b9b4437bc ("ti_armv7_common: Disable Falcon Mode on HS devices") for older 32-bit HS devices and can be enabled on K3 devices.
For secure boot, the kernel with x509 headers can be packaged in a fit container (fitImage) signed with TIFS keys for authentication.
We also set the default SPL_PAYLOAD_ARGS_ADDR which holds the DTB to match ATF's K3_HW_CONFIG_BASE.
--- common/spl/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
common/spl/Kconfig +2 -1
@@ -1148,7 +1148,7 @@ config SPL_ONENAND_SUPPORT config SPL_OS_BOOT bool "Activate Falcon Mode" - depends on !TI_SECURE_DEVICE + depends on !TI_SECURE_DEVICE || ARCH_K3 help Enable booting directly to an OS from SPL. for more info read doc/README.falcon
@@ -1156,6 +1156,7 @@ config SPL_OS_BOOT config SPL_PAYLOAD_ARGS_ADDR hex "Address in memory to load 'args' file for Falcon Mode to" depends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT + default 0x82000000 if ARCH_K3 default 0x88000000 if ARCH_OMAP2PLUS default 0x99000000 if ARCH_SC5XX && SC59X_64 default 0xA0000000 if ARCH_SC5XX && TARGET_SC594_SOM_EZKIT
Signature · 1 line
2.43.0
PATCH 2/10 cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
In reply to Anshul DalalThis allows us to load the kernel image to memory on 32-bit R5 SPL.
--- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
cmd/Kconfig +1 -1
@@ -357,7 +357,7 @@ config CMD_BOOTZ config CMD_BOOTI bool "booti" - depends on ARM64 || RISCV || SANDBOX + depends on ARM64 || RISCV || SANDBOX || ARCH_K3 default y help Boot an AArch64 Linux Kernel image from memory.
Signature · 1 line
2.43.0
Re: [PATCH 02/10] cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
Quoted 12 lines · Anshul Dalal
This allows us to load the kernel image to memory on 32-bit R5 SPL.
Signed-off-by Anshul Dalal <[email protected]>--- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmd/Kconfig +0
-0
cmd/Kconfig config CMD_BOOTZ · line 360
Quoted 5 lines
cmd/Kconfig +1
-1@@ -357,7 +357,7 @@ config CMD_BOOTZ config CMD_BOOTI bool "booti" - depends on ARM64 || RISCV || SANDBOX + depends on ARM64 || RISCV || SANDBOX || ARCH_K3
How are you using "booti" on the R5 part of K3? This shouldn't be useful...
Signature · 1 line
Tom
Re: [PATCH 02/10] cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
Quoted 15 lines · Tom Rini
Quoted 13 lines · Anshul Dalal
This allows us to load the kernel image to memory on 32-bit R5 SPL.
Signed-off-by Anshul Dalal <[email protected]>--- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmd/Kconfig +0
-0@@ -357,7 +357,7 @@ config CMD_BOOTZ
Quoted 7 lines
cmd/Kconfig config CMD_BOOTZ · line 360
Quoted 4 lines
cmd/Kconfig +1
-1config CMD_BOOTI bool "booti" - depends on ARM64 || RISCV || SANDBOX + depends on ARM64 || RISCV || SANDBOX || ARCH_K3How are you using "booti" on the R5 part of K3? This shouldn't be useful...
This is necessary to allow us to call booti_setup [the code path responsible for parsing uncompressed kernel image] from spl_parse_image_header at common/spl/spl.c:338 when loading the Image.
Anshul
Re: [PATCH 02/10] cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
Quoted 24 lines · Anshul Dalal
Quoted 15 lines · Tom Rini
Quoted 13 lines · Anshul Dalal
This allows us to load the kernel image to memory on 32-bit R5 SPL.
Signed-off-by Anshul Dalal <[email protected]>--- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmd/Kconfig +0
-0@@ -357,7 +357,7 @@ config CMD_BOOTZQuoted 7 lines
cmd/Kconfig config CMD_BOOTZ · line 360
Quoted 4 lines
cmd/Kconfig +1
-1config CMD_BOOTI bool "booti" - depends on ARM64 || RISCV || SANDBOX + depends on ARM64 || RISCV || SANDBOX || ARCH_K3How are you using "booti" on the R5 part of K3? This shouldn't be useful...
Quoted 3 lines
This is necessary to allow us to call
booti_setup[the code path responsible for parsing uncompressed kernel image] fromspl_parse_image_headeratcommon/spl/spl.c:338when loading the Image.
OK, so please update arch/arm/lib/Makefile with something like:
ifdef CONFIG_ARCH_K3
obj-$(CONFIG_SPL_OS_BOOT) += booti.o
endif
Thanks.
Signature · 1 line
Tom
Re: [PATCH 02/10] cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
Quoted 25 lines · Tom Rini
Quoted 24 lines · Anshul Dalal
Quoted 22 lines · Tom Rini
Quoted 12 lines · Anshul Dalal
This allows us to load the kernel image to memory on 32-bit R5 SPL.
Signed-off-by Anshul Dalal <[email protected]>--- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmd/Kconfig +0
-0cmd/Kconfig config CMD_BOOTZ · line 360
Quoted 5 lines
cmd/Kconfig +1
-1@@ -357,7 +357,7 @@ config CMD_BOOTZ config CMD_BOOTI bool "booti" - depends on ARM64 || RISCV || SANDBOX + depends on ARM64 || RISCV || SANDBOX || ARCH_K3How are you using "booti" on the R5 part of K3? This shouldn't be useful...
Quoted 8 lines
Quoted 3 lines
This is necessary to allow us to call
booti_setup[the code path responsible for parsing uncompressed kernel image] fromspl_parse_image_headeratcommon/spl/spl.c:338when loading the Image.OK, so please update
arch/arm/lib/Makefilewith something like:
ifdefCONFIG_ARCH_K3
obj-$(CONFIG_SPL_OS_BOOT) += booti.o
endif
We would still have to have CMD_BOOTI enabled even with this change because of the check at common/spl/spl.c:338. I suggest we proceed with my original set of changes instead.
Anshul
Re: [PATCH 02/10] cmd: Kconfig: enable CMD_BOOTI for ARCH_K3
Quoted 30 lines · Anshul Dalal
Quoted 29 lines · Tom Rini
Quoted 27 lines · Anshul Dalal
Quoted 15 lines · Tom Rini
Quoted 13 lines · Anshul Dalal
This allows us to load the kernel image to memory on 32-bit R5 SPL.
Signed-off-by Anshul Dalal <[email protected]>--- cmd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmd/Kconfig +0
-0@@ -357,7 +357,7 @@ config CMD_BOOTZQuoted 7 lines
cmd/Kconfig config CMD_BOOTZ · line 360
Quoted 4 lines
cmd/Kconfig +1
-1config CMD_BOOTI bool "booti" - depends on ARM64 || RISCV || SANDBOX + depends on ARM64 || RISCV || SANDBOX || ARCH_K3How are you using "booti" on the R5 part of K3? This shouldn't be useful...
This is necessary to allow us to call
booti_setup[the code path responsible for parsing uncompressed kernel image] fromspl_parse_image_headeratcommon/spl/spl.c:338when loading the Image.
Quoted 8 lines
Quoted 4 lines
OK, so please update
arch/arm/lib/Makefilewith something like:
ifdefCONFIG_ARCH_K3
obj-$(CONFIG_SPL_OS_BOOT) += booti.o
endifWe would still have to have
CMD_BOOTIenabled even with this change because of the check atcommon/spl/spl.c:338. I suggest we proceed with my original set of changes instead.
No, things need to be reworked more then as it doesn't make logical sense to enable a command in SPL (where there are no commands). It's odd enough that we need to enable support for image formats that don't exist on 32bit arm, on 32bit arm. What's there in common/spl/spl.c:338 (and the next check) is a short-hand.
Signature · 1 line
Tom
PATCH 3/10 mach-k3: fix reading size and addr from fdt on R5
In reply to Anshul Dalalfdtdec_get_addr_size uses architecture dependent datatypes which causes the 32-bit R5 to fail when reading the 64-bit size and addr fields of reg nodes from the fdt.
This changes it to a common api for both 64 and 32 bit platforms. Now fdt fixups can be applied to the fdt from R5.
--- arch/arm/mach-k3/common_fdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-k3/common_fdt.c +3 -1
@@ -139,7 +139,9 @@ int fdt_fixup_reserved(void *blob, const char *name,return -EINVAL ;if (!strncmp (node_name, name,strlen (name))) {/* Read out old size first */ - addr =fdtdec_get_addr_size (blob, subnode,"reg" , &size); + addr =fdtdec_get_addr_size_fixed ( + blob, subnode,"reg" ,0 ,8 /sizeof (fdt32_t), +8 /sizeof (fdt32_t), &size, false);if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; new_size = size;
Signature · 1 line
2.43.0
PATCH 4/10 arm: dts: am62a: allow booting from eMMC
In reply to Anshul DalalThe bootph-all property in u-boot enables driver initialization prior to relocation, this is necessary to use the device as boot media.
sdhci0 is the phandle for eMMC on am62a, so this change allows us to use eMMC as a boot media.
--- arch/arm/dts/k3-am62a7-sk-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +4 -0
@@ -100,6 +100,10 @@ bootph-all; }; +&sdhci0 { + bootph-all; +}; + &sdhci1 { bootph-all; };
Signature · 1 line
2.43.0
PATCH 5/10 arch: arm: k3-binman: add fit for falcon boot
In reply to Anshul DalalThis adds creation of tispl_falcon.bin for the am62a, 62p and 62x.
The contents are the same as the existing tispl.bin but A53's spl and the fdt have been removed as they are not needed in falcon boot.
This reduces boot time since the payload size is smaller and we also aren't authenticating the spl and fdt in secure boot.
--- arch/arm/dts/k3-am625-sk-binman.dtsi | 64 ++++++++++++++++++++++++++++ arch/arm/dts/k3-am62a-sk-binman.dtsi | 64 ++++++++++++++++++++++++++++ arch/arm/dts/k3-am62p-sk-binman.dtsi | 51 ++++++++++++++++++++++ arch/arm/dts/k3-binman.dtsi | 53 +++++++++++++++++++++++ 4 files changed, 232 insertions(+)
arch/arm/dts/k3-am625-sk-binman.dtsi +64 -0
@@ -219,6 +219,70 @@ }; }; + ti-falcon { + insert-template = <&ti_falcon_template>; + + fit { + images { + tifsstub-hs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + tifsstub-fs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + tifsstub-gp { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { + ti-secure { + content = <&dm_falcon>; + keyfile = "custMpk.pem"; + }; + dm_falcon: ti-dm { + filename = "ti-dm.bin"; + }; + }; + }; + + configurations { + default = "conf-0"; + conf-0 { + description = "k3-am625-sk-falcon"; + firmware = "atf"; + loadables = "tee", "tifsstub-hs", "tifsstub-fs", + "tifsstub-gp", "dm"; + }; + }; + }; + }; + ti-spl { insert-template = <&ti_spl_template>;
arch/arm/dts/k3-am62a-sk-binman.dtsi +64 -0
70 lines not on this page · raw message
arch/arm/dts/k3-am62p-sk-binman.dtsi +51 -0
57 lines not on this page · raw message
arch/arm/dts/k3-binman.dtsi +53 -0
59 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 6/10 mach-k3: add eMMC FS boot support for am62[ap]
In reply to Anshul DalalThis makes spl_mmc_boot_mode consistent across am62x, 62a and 62p.
If MMCSD_MODE_EMMCBOOT is returned, FS boot fails since it checks for FS on the hardware partitions, not the UDA. So to allow FS boot from EMMC, the function should return MMCSD_MODE_FS instead which allows us to read from FS on the UDA.
--- arch/arm/mach-k3/am62ax/am62a7_init.c | 4 ++++ arch/arm/mach-k3/am62px/am62p5_init.c | 4 ++++ 2 files changed, 8 insertions(+)
arch/arm/mach-k3/am62ax/am62a7_init.c +4 -0
@@ -207,6 +207,10 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)switch (bootmode) {case BOOT_DEVICE_EMMC : +if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT )) +return MMCSD_MODE_EMMCBOOT ; +if (IS_ENABLED (CONFIG_SPL_FS_FAT ) ||IS_ENABLED (CONFIG_SPL_FS_EXT4 )) +return MMCSD_MODE_FS ;return MMCSD_MODE_EMMCBOOT ;case BOOT_DEVICE_MMC :if (bootmode_cfg &MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK )
arch/arm/mach-k3/am62px/am62p5_init.c +4 -0
@@ -262,6 +262,10 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)switch (bootmode) {case BOOT_DEVICE_EMMC : +if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT )) +return MMCSD_MODE_EMMCBOOT ; +if (IS_ENABLED (CONFIG_SPL_FS_FAT ) ||IS_ENABLED (CONFIG_SPL_FS_EXT4 )) +return MMCSD_MODE_FS ;return MMCSD_MODE_EMMCBOOT ;case BOOT_DEVICE_MMC :if (bootmode_cfg &MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK )
Signature · 1 line
2.43.0
PATCH 7/10 mach-k3: sysfw-loader: update img_hdr for falcon
In reply to Anshul DalalThe returned legacy_img_hdr is used by booti_setup to compute the load address for the kernel image.
This change ensures the kernel load address is CONFIG_SYS_LOAD_ADDR in falcon boot.
--- arch/arm/mach-k3/r5/sysfw-loader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/mach-k3/r5/sysfw-loader.c +5 -1
@@ -89,7 +89,11 @@ static void *sysfw_load_address;struct legacy_img_hdr *spl_get_load_buffer (ssize_t offset,size_t size) {if (sysfw_loaded) -return (struct legacy_img_hdr *)(CONFIG_TEXT_BASE + offset); +if (IS_ENABLED (CONFIG_SPL_OS_BOOT )) +return (struct legacy_img_hdr *)CONFIG_SYS_LOAD_ADDR ; +else +return (struct legacy_img_hdr *)(CONFIG_TEXT_BASE + + offset);else if (sysfw_load_address)return sysfw_load_address;else
Signature · 1 line
2.43.0
PATCH 8/10 configs: ti_armv7_common: add cfgs for SPI falcon boot
In reply to Anshul DalalWhen booting from SPI, only the tispl.bin and tiboot3.bin is loaded from the SPI. tiboot3.bin is located by the ROM and tispl.bin's offset is specified by CONFIG_SYS_SPI_U_BOOT_OFFS.
The kernel and args however are loaded from the eMMC or SD and not SPI, therefore we don't actually make use of these config values at runtime, they are added to avoid compile time 'undefined identifier' errors when building with SPL_OS_BOOT enabled.
--- include/configs/ti_armv7_common.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/configs/ti_armv7_common.h +6 -0
@@ -119,6 +119,12 @@/* FAT */ /* RAW SD card / eMMC */ + +/* SPI */ +#define CFG_SYS_SPI_KERNEL_OFFS 0 +#define CFG_SYS_SPI_ARGS_OFFS 0 +#define CFG_SYS_SPI_ARGS_SIZE 0 +#endif /* General parts of the framework, required. */
Signature · 1 line
2.43.0
Re: [PATCH 08/10] configs: ti_armv7_common: add cfgs for SPI falcon boot
Quoted 19 lines · Anshul Dalal
When booting from SPI, only the tispl.bin and tiboot3.bin is loaded from the SPI. tiboot3.bin is located by the ROM and tispl.bin's offset is specified by
CONFIG_SYS_SPI_U_BOOT_OFFS.The kernel and args however are loaded from the eMMC or SD and not SPI, therefore we don't actually make use of these config values at runtime, they are added to avoid compile time 'undefined identifier' errors when building with
SPL_OS_BOOTenabled.Signed-off-by Anshul Dalal <[email protected]>--- include/configs/ti_armv7_common.h | 6 ++++++ 1 file changed, 6 insertions(+)include/configs/ti_armv7_common.h +0
-0
include/configs/ti_armv7_common.h line 128
Quoted 10 lines
include/configs/ti_armv7_common.h +6
-0@@ -119,6 +119,12 @@/* FAT */ /* RAW SD card / eMMC */ + +/* SPI */ +#define CFG_SYS_SPI_KERNEL_OFFS 0 +#define CFG_SYS_SPI_ARGS_OFFS 0 +#define CFG_SYS_SPI_ARGS_SIZE 0 +#endif
We need to refactor the code and migrate these to Kconfig as well.
Signature · 1 line
Tom
Re: [EXTERNAL] Re: [PATCH 08/10] configs: ti_armv7_common: add cfgs for SPI falcon boot
Quoted 23 lines · Tom Rini
Quoted 21 lines · Anshul Dalal
When booting from SPI, only the tispl.bin and tiboot3.bin is loaded from the SPI. tiboot3.bin is located by the ROM and tispl.bin's offset is specified by
CONFIG_SYS_SPI_U_BOOT_OFFS.The kernel and args however are loaded from the eMMC or SD and not SPI, therefore we don't actually make use of these config values at runtime, they are added to avoid compile time 'undefined identifier' errors when building with
SPL_OS_BOOTenabled.Signed-off-by Anshul Dalal <[email protected]>--- include/configs/ti_armv7_common.h | 6 ++++++ 1 file changed, 6 insertions(+)include/configs/ti_armv7_common.h +0
-0@@ -119,6 +119,12 @@/* FAT */
Quoted 10 lines
include/configs/ti_armv7_common.h line 128
Quoted 8 lines
include/configs/ti_armv7_common.h +6
-0/* RAW SD card / eMMC */ + +/* SPI */ +#define CFG_SYS_SPI_KERNEL_OFFS 0 +#define CFG_SYS_SPI_ARGS_OFFS 0 +#define CFG_SYS_SPI_ARGS_SIZE 0 +#endif We need to refactor the code and migrate these to
Kconfigas well.
Yeah, we're already using Kconfig for raw eMMC as well doing the same for SPI make sense.
Anshul
PATCH 9/10 config: add falcon boot config fragment for am62x
In reply to Anshul DalalThis fragment enables falcon boot for the am62x, 62a and 62p.
To have enough stack and heap space for loading kernel image as FIT, the memory map was modified as shown below, the PRELOADED_BL33_BASE in ATF has to also be updated to 0x80200000 since the kernel requires to be loaded at 2MiB aligned address.
Memory Map (changed addresses marked with *):
0x80000000 +-------------------------------+ Start of DDR
512KiB | ATF reserved memory space | CONFIG_K3_ATF_LOAD_ADDR0x80080000 +-------------------------------+
1.5MiB | Unused |0x80200000 +-------------------------------+ PRELOADED_BL33_BASE* in ATF
| | CONFIG_SYS_LOAD_ADDR* (load
30MiB | Kernel + initramfs Image | address for kernel)
| |
0x82000000 +-------------------------------+ K3_HW_CONFIG_BASE in ATF
| | CONFIG_SPL_PAYLOAD_ARGS_ADDR*
1MiB | Kernel DTB |
| |
0x82100000 +-------------------------------+ CONFIG_SPL_LOAD_FIT_ADDRESS*
| |
55MiB |Initial Download Region for FIT|
| |
0x85800000 +-------------------------------+
| |
| R5 U-Boot SPL Stack + Heap |
56MiB | (size defined by |
| SPL_STACK_R_MALLOC_SIMPLE_LEN)|
| |0x89000000 +-------------------------------+ CONFIG_SPL_STACK_R_ADDR*
344MiB | Device Manager (DM) |0x9e800000 +-------------------------------+ BL32_BASE in ATF
24MiB | OPTEE |0xa0000000 +-------------------------------+ End of DDR (512MiB)
--- configs/am62x_r5_falcon.config | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 configs/am62x_r5_falcon.config
configs/am62x_r5_falcon.config new file +30 -0
@@ -0,0 +1,30 @@ +# Enable falcon mode +CONFIG_SPL_OS_BOOT=y + +# We use envs for setting bootargs and optionally for `falcon_(image|args)_file` +CONFIG_SPL_ENV_SUPPORT=y + +# Perform FDT fixups from SPL +CONFIG_OF_SYSTEM_SETUP=y + +# Enabling this causes issues with EMMC FS boot, +# When enabled the SPL tries to detect FS on boot[01] hw partition which fails +# since we need the raw tiboot3.bin there for the board to boot instead +CONFIG_SUPPORT_EMMC_BOOT=n + +# Used as the 2MiB aligned load address for kernel +CONFIG_SYS_LOAD_ADDR=0x80200000 +CONFIG_SPL_LOAD_FIT_ADDRESS=0x82100000 +CONFIG_SPL_STACK_R_ADDR=0x89000000 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x3800000 +CONFIG_SYS_BOOTM_LEN=0x1e00000 + +# Loading tispl_falcon instead of tispl which has fdt and A53 spl saves time +CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="tispl_falcon.bin" +CONFIG_SPL_FS_LOAD_KERNEL_NAME="Image" +# We don't use the args file when loading fitImage since it has dtb pre-packaged +# this is only useful while reading the raw kernel image from FS +CONFIG_SPL_FS_LOAD_ARGS_NAME="falcon.dtb" + +# Disabled to save space on the spl +CONFIG_SPL_YMODEM_SUPPORT=n
Signature · 1 line
2.43.0
Re: [PATCH 09/10] config: add falcon boot config fragment for am62x
Quoted 31 lines · Anshul Dalal
This fragment enables falcon boot for the am62x, 62a and 62p.
To have enough stack and heap space for loading kernel image as FIT, the memory map was modified as shown below, the
PRELOADED_BL33_BASEin ATF has to also be updated to0x80200000since the kernel requires to be loaded at 2MiB aligned address.Memory Map (changed addresses marked with *):
0x80000000+-------------------------------+ Start of DDR
512KiB | ATF reserved memory space |CONFIG_K3_ATF_LOAD_ADDR0x80080000+-------------------------------+
1.5MiB | Unused |0x80200000+-------------------------------+ PRELOADED_BL33_BASE* in ATF| | CONFIG_SYS_LOAD_ADDR* (load 30MiB | Kernel + initramfs Image | address for kernel) | | 0x82000000 +-------------------------------+ K3_HW_CONFIG_BASE in ATF | | CONFIG_SPL_PAYLOAD_ARGS_ADDR* 1MiB | Kernel DTB | | | 0x82100000 +-------------------------------+ CONFIG_SPL_LOAD_FIT_ADDRESS* | | 55MiB |Initial Download Region for FIT| | | 0x85800000 +-------------------------------+ | | | R5 U-Boot SPL Stack + Heap | 56MiB | (size defined by | | SPL_STACK_R_MALLOC_SIMPLE_LEN)| | |
Quoted 5 lines
0x89000000+-------------------------------+ CONFIG_SPL_STACK_R_ADDR*
344MiB | Device Manager (DM) |0x9e800000+-------------------------------+BL32_BASEin ATF
24MiB | OPTEE |0xa0000000+-------------------------------+ End of DDR (512MiB)
This information is good and belongs in a relevant rst file, not just commit message.
Signature · 1 line
Tom
Re: [EXTERNAL] Re: [PATCH 09/10] config: add falcon boot config fragment for am62x
Quoted 38 lines · Tom Rini
Quoted 31 lines · Anshul Dalal
This fragment enables falcon boot for the am62x, 62a and 62p.
To have enough stack and heap space for loading kernel image as FIT, the memory map was modified as shown below, the
PRELOADED_BL33_BASEin ATF has to also be updated to0x80200000since the kernel requires to be loaded at 2MiB aligned address.Memory Map (changed addresses marked with *):
0x80000000+-------------------------------+ Start of DDR
512KiB | ATF reserved memory space |CONFIG_K3_ATF_LOAD_ADDR0x80080000+-------------------------------+
1.5MiB | Unused |0x80200000+-------------------------------+ PRELOADED_BL33_BASE* in ATF| | CONFIG_SYS_LOAD_ADDR* (load 30MiB | Kernel + initramfs Image | address for kernel) | | 0x82000000 +-------------------------------+ K3_HW_CONFIG_BASE in ATF | | CONFIG_SPL_PAYLOAD_ARGS_ADDR* 1MiB | Kernel DTB | | | 0x82100000 +-------------------------------+ CONFIG_SPL_LOAD_FIT_ADDRESS* | | 55MiB |Initial Download Region for FIT| | | 0x85800000 +-------------------------------+ | | | R5 U-Boot SPL Stack + Heap | 56MiB | (size defined by | | SPL_STACK_R_MALLOC_SIMPLE_LEN)| | |Quoted 5 lines
0x89000000+-------------------------------+ CONFIG_SPL_STACK_R_ADDR*
344MiB | Device Manager (DM) |0x9e800000+-------------------------------+BL32_BASEin ATF
24MiB | OPTEE |0xa0000000+-------------------------------+ End of DDR (512MiB)
Quoted 2 lines
This information is good and belongs in a relevant rst file, not just commit message.
I wanted to get some feedback first before updating the documentation in case there were any changes to the boot flow. Once we have finalized that, I will update the documentation in an upcoming revision of this patch set.
Anshul
PATCH 10/10 mach-k3: common: add falcon support for 62[axp]
In reply to Anshul DalalWe use the spl_board_prepare_for_boot hook to call k3_falcon_prep which is ran after tispl is loaded but before jump_to_image.
In here, we find the boot media and load the image just as std falcon flow (since spl_start_uboot returns 0 now). Once the kernel and args are loaded, we perform fdt fixups on the fdt accompanying the kernel (if loaded as FIT) or the loaded up args and return.
Now when the flow goes to jump_to_image, we do the regular pre-jump procedure and jump to ATF which jumps to the kernel directly since we have already loaded the kernel and dtb at their respective addresses (PRELOADED_BL33_BASE and K3_HW_CONFIG_BASE).
--- arch/arm/mach-k3/common.c | 105 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+)
arch/arm/mach-k3/common.c +105 -0
@@ -263,8 +263,113 @@ static __maybe_unused void k3_dma_remove(void)pr_warn ("DMA Device not found (err=%d)\n" , rc); } +#if IS_ENABLED (CONFIG_SPL_OS_BOOT ) && !IS_ENABLED (CONFIG_ARM64 ) +static bool tispl_loaded; + +int spl_start_uboot (void ) +{ +if (!tispl_loaded) +return 1 ; +return 0 ; +} + +static int k3_falcon_fdt_fixup (void *fdt) +{ +struct disk_partition info; +struct blk_desc *dev_desc; +char bootmedia[32 ]; +char bootpart[32 ]; +char str[256 ]; +int ret; + +strcpy (bootmedia,env_get ("boot" )); +strcpy (bootpart,env_get ("bootpart" )); + ret =blk_get_device_part_str (bootmedia, bootpart, &dev_desc, &info,0 ); +if (ret <0 ) +printf ("Failed to get part details for %s %s [%d]\n" , bootmedia, + bootpart, ret); +sprintf (str,"console=%s root=PARTUUID=%s rootwait" ,env_get ("console" ), + info.uuid); + ret =fdt_find_and_setprop (fdt,"/chosen" ,"bootargs" , str, +strlen (str) +1 ,1 ); +if (ret) { +printf ("Could not set bootargs: %s\n" ,fdt_strerror (ret)); +return ret; + } +debug ("Set bootargs to: %s\n" , str); + +#ifdef CONFIG_OF_BOARD_SETUP + ret =ft_board_setup (fdt, gd->bd); +if (ret) { +printf ("Failed in board fdt fixups: %s\n" ,fdt_strerror (ret)); +return ret; + } +#endif + +#ifdef CONFIG_OF_SYSTEM_SETUP + ret =ft_system_setup (fdt, gd->bd); +if (ret) { +printf ("Failed in system fdt fixups: %s\n" ,fdt_strerror (ret)); +return ret; + } +#endif + +return 0 ; +} + +static int k3_falcon_prep (void ) +{ +struct spl_image_loader *loader, *drv; +struct spl_image_info kernel_image; +struct spl_boot_device bootdev; +int ret = -ENXIO , n_ents; +void *fdt; + + tispl_loaded = true; +memset (&kernel_image,'\0' ,sizeof (kernel_image)); + drv = ll_entry_start(struct spl_image_loader, spl_image_loader); + n_ents = ll_entry_count(struct spl_image_loader, spl_image_loader); + bootdev.boot_device =spl_boot_device (); +if (bootdev.boot_device ==BOOT_DEVICE_SPI ) { +if (strcmp (env_get ("mmcdev" ),"1" ) ==0 ) + bootdev.boot_device =BOOT_DEVICE_MMC ; +else + bootdev.boot_device =BOOT_DEVICE_EMMC ; + } + bootdev.boot_device_name =NULL ; + +for (loader = drv; loader != drv + n_ents; loader++) { +if (bootdev.boot_device != loader->boot_device) +continue ; +if (loader) { +printf ("Loading falcon payload from %s\n" , +spl_loader_name (loader)); + ret = loader->load_image (&kernel_image, &bootdev); +if (ret) +continue ; + + fdt =spl_image_fdt_addr (&kernel_image); +if (!fdt) + fdt = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR ; + ret =k3_falcon_fdt_fixup (fdt); +if (ret) { +printf ("Failed performing fdt fixups in falcon flow: [%d]\n" , + ret); +return ret; + } +return 0 ; + } + } + +return ret; +} +#endif +void spl_board_prepare_for_boot (void ) { +#if IS_ENABLED (CONFIG_SPL_OS_BOOT ) && !IS_ENABLED (CONFIG_ARM64 ) +k3_falcon_prep (); +#endif #if !(defined(CONFIG_SYS_ICACHE_OFF ) && defined(CONFIG_SYS_DCACHE_OFF ))dcache_disable ();#endif
Signature · 1 line
2.43.0