plat-ti: Restore non-secure entry address from saved copy in r5
When resuming the only value we need to work with a new version of is the
non-secure context as it will have changed since boot. This value is
stored on OP-TEE entry in r5, previously we saved this value by moving
r5 to r3 then r3 to r4 basically just dodging getting overwritten by
functions we call. This can be simplified now as nothing clobbers r5,
so we can use it directly as the source for the non-secure context
pointer feed into init_sec_mon().
Signed-off-by: Andrew F. Davis <afd@ti.com>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
diff --git a/core/arch/arm/plat-ti/a9_plat_init.S b/core/arch/arm/plat-ti/a9_plat_init.S
index 24174ef..85f9fd3 100644
--- a/core/arch/arm/plat-ti/a9_plat_init.S
+++ b/core/arch/arm/plat-ti/a9_plat_init.S
@@ -75,8 +75,6 @@
LOCAL_FUNC resume_springboard , :
UNWIND( .fnstart)
UNWIND( .cantunwind)
- mov r3, r5
-
/* Setup tmp stack */
bl __get_core_pos
cmp r0, #CFG_TEE_CORE_NB_CORE
@@ -100,10 +98,10 @@
bl sm_pm_cpu_do_resume
after_resume:
- mov r4, r3
bl thread_init_per_cpu
- mov r0, r4
+ /* r5 contains the non-secure entry address (ARMv7 bootarg #0) */
+ mov r0, r5
bl init_sec_mon
bl main_init_gic
