psci: fix use of clobbered registers in asm
PATCH 1/1 psci: fix use of clobbered registers in asm
The functions psci_get_context_id and psci_get_target_pc are written in C, so the C compiler may clobber registers r0-r3. Do not use these registers to save data across calls.
Signed-off-by Sam Edwards <[email protected]>
--- arch/arm/cpu/armv7/psci.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/psci.S +3 -3
@@ -311,11 +311,11 @@ ENTRY(psci_cpu_entry) bl psci_arch_cpu_entry bl psci_get_cpu_id @ CPU ID => r0 - mov r2, r0 @ CPU ID => r2 bl psci_get_context_id @ context id => r0 - mov r1, r0 @ context id => r1 - mov r0, r2 @ CPU ID => r0 + push {r0} @ save context id + bl psci_get_cpu_id @ CPU ID => r0 bl psci_get_target_pc @ target PC => r0 + pop {r1} @ context id => r1 b _do_nonsec_entry ENDPROC(psci_cpu_entry)
Signature · 1 line
2.39.2
Quoted 5 lines · Sam Edwards
The functions
psci_get_context_idandpsci_get_target_pcare written in C, so the C compiler may clobber registers r0-r3. Do not use these registers to save data across calls.Signed-off-by Sam Edwards <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom