diff options
| author | Jeenu Viswambharan <jeenu.viswambharan@arm.com> | 2017-07-20 16:42:50 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-08-08 12:35:28 +0100 |
| commit | f639615279d5ea5bd3adeed64d615b6e24382250 (patch) | |
| tree | 8b2869a510fe96c0a20c090054622986bbe37ad5 | |
| parent | 6e00224e6fc21eaacb4f2fe432ac720bebd37d46 (diff) | |
FVP: Fix AArch32 stack functions to be ABI-compliant
plat_get_my_stack is called from C, so it can't expect argument
registers to be preserved. Stash registers temporarily onto the stack
instead.
plat_set_my_stack is called during early init, when there exists no
stack. Use any register other than argument registers to stash temporary
values.
Change-Id: I98052e20671d0933201d45ec7a5affccd71ce08c
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
| -rw-r--r-- | plat/common/aarch32/platform_mp_stack.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plat/common/aarch32/platform_mp_stack.S b/plat/common/aarch32/platform_mp_stack.S index e43047e55..6c3d08de3 100644 --- a/plat/common/aarch32/platform_mp_stack.S +++ b/plat/common/aarch32/platform_mp_stack.S @@ -19,9 +19,9 @@ * ----------------------------------------------------- */ func plat_get_my_stack - mov r3, lr + push {r4, lr} get_my_mp_stack platform_normal_stacks, PLATFORM_STACK_SIZE - bx r3 + pop {r4, pc} endfunc plat_get_my_stack /* ----------------------------------------------------- @@ -32,10 +32,10 @@ endfunc plat_get_my_stack * ----------------------------------------------------- */ func plat_set_my_stack - mov r3, lr + mov r4, lr get_my_mp_stack platform_normal_stacks, PLATFORM_STACK_SIZE mov sp, r0 - bx r3 + bx r4 endfunc plat_set_my_stack /* ----------------------------------------------------- |