diff options
| author | Ricardo Salveti <ricardo@foundries.io> | 2021-10-20 15:12:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-25 17:17:24 -0400 |
| commit | 949eb228f3f807feb338d29e9c94d97c22fa98b6 (patch) | |
| tree | ca643d9f848a87bd261ec7855598a6a0d14d41c5 | |
| parent | d11d1becbd6ab67c4cc0c19bda2886b28c1fdc02 (diff) | |
| download | u-boot-949eb228f3f807feb338d29e9c94d97c22fa98b6.zip u-boot-949eb228f3f807feb338d29e9c94d97c22fa98b6.tar.gz u-boot-949eb228f3f807feb338d29e9c94d97c22fa98b6.tar.bz2 | |
arm: spl: prepare for jumping to OPTEE
Make sure to (if applicable) flush the D-cache, invalidate I-cache,
and disable MMU and caches before jumping to OPTEE.
This fixes the SDP->SPL->OPTEE boot flow on iMX6Q and most likely on
some other ARM SoCs.
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Co-developed-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
| -rw-r--r-- | arch/arm/lib/spl.c | 11 | ||||
| -rw-r--r-- | common/spl/spl.c | 11 | ||||
| -rw-r--r-- | include/spl.h | 11 |
3 files changed, 30 insertions, 3 deletions
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 8e2bdf3..4f9b84b 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -77,3 +77,14 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) } #endif /* CONFIG_ARM64 */ #endif + +#if CONFIG_IS_ENABLED(OPTEE_IMAGE) +void __noreturn jump_to_image_optee(struct spl_image_info *spl_image) +{ + /* flush and turn off caches before jumping to OPTEE */ + cleanup_before_linux(); + + spl_optee_entry(NULL, NULL, spl_image->fdt_addr, + (void *)spl_image->entry_point); +} +#endif diff --git a/common/spl/spl.c b/common/spl/spl.c index a9304d4..0c08da0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -174,6 +174,14 @@ __weak void spl_board_prepare_for_optee(void *fdt) { } +#if CONFIG_IS_ENABLED(OPTEE_IMAGE) +__weak void __noreturn jump_to_image_optee(struct spl_image_info *spl_image) +{ + spl_optee_entry(NULL, NULL, spl_image->fdt_addr, + (void *)spl_image->entry_point); +} +#endif + __weak void spl_board_prepare_for_boot(void) { /* Nothing to do! */ @@ -780,8 +788,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) case IH_OS_TEE: debug("Jumping to U-Boot via OP-TEE\n"); spl_board_prepare_for_optee(spl_image.fdt_addr); - spl_optee_entry(NULL, NULL, spl_image.fdt_addr, - (void *)spl_image.entry_point); + jump_to_image_optee(&spl_image); break; #endif #if CONFIG_IS_ENABLED(OPENSBI) diff --git a/include/spl.h b/include/spl.h index 7ddb2ab..0af0ee3 100644 --- a/include/spl.h +++ b/include/spl.h @@ -469,6 +469,15 @@ int spl_board_boot_device(u32 boot_device); void __noreturn jump_to_image_linux(struct spl_image_info *spl_image); /** + * jump_to_image_linux() - Jump to OP-TEE OS from SPL + * + * This jumps into OP-TEE OS using the information in @spl_image. + * + * @spl_image: Image description to set up + */ +void __noreturn jump_to_image_optee(struct spl_image_info *spl_image); + +/** * spl_start_uboot() - Check if SPL should start the kernel or U-Boot * * This is called by the various SPL loaders to determine whether the board @@ -759,7 +768,7 @@ struct bl_params *bl2_plat_get_bl31_params_v2_default(uintptr_t bl32_entry, * @arg2: device tree address, (ARMv7 standard bootarg #2) * @arg3: non-secure entry address (ARMv7 bootarg #0) */ -void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); +void __noreturn spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); /** * spl_invoke_opensbi - boot using a RISC-V OpenSBI image |