aboutsummaryrefslogtreecommitdiff
path: root/common/aarch64/debug.S
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-07-27 14:59:34 -0700
committerJulius Werner <jwerner@chromium.org>2017-08-21 13:50:54 -0700
commit4d91838b8d01a9e99c44fd0ed72f5d81b4595f17 (patch)
tree710929f9ed09fc109d0e998f65839c713dc671a2 /common/aarch64/debug.S
parent5ae4dab2b86351579d85d5f5a8f85252336381b8 (diff)
downloadtrusted-firmware-a-4d91838b8d01a9e99c44fd0ed72f5d81b4595f17.tar.gz
Fix x30 reporting for unhandled exceptions
Some error paths that lead to a crash dump will overwrite the value in the x30 register by calling functions with the no_ret macro, which resolves to a BL instruction. This is not very useful and not what the reader would expect, since a crash dump should usually show all registers in the state they were in when the exception happened. This patch replaces the offending function calls with a B instruction to preserve the value in x30. Change-Id: I2a3636f2943f79bab0cd911f89d070012e697c2a Signed-off-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'common/aarch64/debug.S')
-rw-r--r--common/aarch64/debug.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S
index fe6a9a2dbf..d794d12ead 100644
--- a/common/aarch64/debug.S
+++ b/common/aarch64/debug.S
@@ -175,6 +175,6 @@ el3_panic:
_panic_handler:
/* Pass to plat_panic_handler the address from where el3_panic was
* called, not the address of the call from el3_panic. */
- mov x30,x6
- no_ret plat_panic_handler
+ mov x30, x6
+ b plat_panic_handler
endfunc do_panic