aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2022-11-29 10:32:46 +0100
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2022-11-29 10:32:46 +0100
commitc6432394a98c51c2c690579985a881345a1d266c (patch)
tree435341f28f02a84fa17f3bf4469c1f8f7b1e2fd4
parentd3d2a5a484936a17a4425ea3634b1c2e64dac877 (diff)
parent5fb6946ad70f5c6e82502a704633bba1dd82e507 (diff)
downloadtrusted-firmware-a-c6432394a98c51c2c690579985a881345a1d266c.tar.gz
Merge "fix(console): fix crash on spin_unlock with cache disabled" into integration
-rw-r--r--plat/common/aarch64/crash_console_helpers.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/common/aarch64/crash_console_helpers.S b/plat/common/aarch64/crash_console_helpers.S
index e2950f5f7c..75b4208933 100644
--- a/plat/common/aarch64/crash_console_helpers.S
+++ b/plat/common/aarch64/crash_console_helpers.S
@@ -68,12 +68,12 @@ func plat_crash_console_init
mov x4, x30 /* x3 and x4 are not clobbered by spin_lock() */
mov x3, #0 /* return value */
+ adrp x0, crash_console_spinlock
+ add x0, x0, :lo12:crash_console_spinlock
+
mrs x1, sctlr_el3
tst x1, #SCTLR_C_BIT
beq skip_spinlock /* can't synchronize when cache disabled */
-
- adrp x0, crash_console_spinlock
- add x0, x0, :lo12:crash_console_spinlock
bl spin_lock
skip_spinlock: