summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-02-22 23:29:11 +0000
committerGitHub <noreply@github.com>2018-02-22 23:29:11 +0000
commit2e919a39d9f8f1a2d3f6666a940c834cf13cb3e3 (patch)
treeb75b904b8a2f3058dd4055c88fc44c7225676147
parent4535554e681d2057825a7cb6d5ebc478ff4d0425 (diff)
parent7af7038e87b133bb0de0240bb54f837ca79dbc3b (diff)
Merge pull request #1278 from soby-mathew/sm/aarch32_errata_fix
Fixup AArch32 errata printing framework
-rw-r--r--lib/cpus/aarch32/cpu_helpers.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/cpus/aarch32/cpu_helpers.S b/lib/cpus/aarch32/cpu_helpers.S
index 72e42c67..ddc08084 100644
--- a/lib/cpus/aarch32/cpu_helpers.S
+++ b/lib/cpus/aarch32/cpu_helpers.S
@@ -206,7 +206,8 @@ endfunc cpu_rev_var_hs
*/
.globl print_errata_status
func print_errata_status
- push {r4, lr}
+ /* r12 is pushed only for the sake of 8-byte stack alignment */
+ push {r4, r5, r12, lr}
#ifdef IMAGE_BL1
/*
* BL1 doesn't have per-CPU data. So retrieve the CPU operations
@@ -241,6 +242,6 @@ func print_errata_status
blxne r4
1:
#endif
- pop {r4, pc}
+ pop {r4, r5, r12, pc}
endfunc print_errata_status
#endif