Merge pull request #1278 from soby-mathew/sm/aarch32_errata_fix

Fixup AArch32 errata printing framework

Merge pull request #1278 from soby-mathew/sm/aarch32_errata_fix
Fixup AArch32 errata printing framework
2e919a39 · davidcunado-arm · GitHub · 4535554e · 7af7038e · 2e919a39
Unverified Commit 2e919a39 authored 7 years ago by davidcunado-arm Committed by GitHub 7 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 2 deletions
+3 -2
--- 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