From: Ricardo Salveti ricardo@foundries.io
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 ---
Changes in v2: - fix: building on evb-rk3229 and evb-rk3288; - fix: warning about return from noreturn-function.
arch/arm/lib/spl.c | 11 +++++++++++ common/spl/spl.c | 11 +++++++++-- include/spl.h | 9 +++++++++ 3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 8e2bdf3536..4f9b84ba34 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 a9304d4148..0c08da06e8 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 bac897fc81..f7d1ef5c88 100644 --- a/include/spl.h +++ b/include/spl.h @@ -460,6 +460,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 *