aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-02-20 09:02:24 +0000
committerGitHub <noreply@github.com>2018-02-20 09:02:24 +0000
commit5ff5a6d9c33fdf8b626a4e61066f467f2b5c75a9 (patch)
tree42ab9acd054ee0820b962cfc9fcec0d6ba42df38 /bl31
parent601abdba4aaa8db1f085d0a61960c64bafc22337 (diff)
parent4abd7fa71f3cf921aab7c2b59a838f9c5bb10bb2 (diff)
downloadtrusted-firmware-a-5ff5a6d9c33fdf8b626a4e61066f467f2b5c75a9.tar.gz
Merge pull request #1270 from antonio-nino-diaz-arm/an/smc-unknown
Redefine SMC_UNK as -1 instead of 0xFFFFFFFF
Diffstat (limited to 'bl31')
-rw-r--r--bl31/aarch64/runtime_exceptions.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index 57c065c6a8..60be932745 100644
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -390,12 +390,12 @@ smc_unknown:
* content). Either way, we aren't leaking any secure information
* through them.
*/
- mov w0, #SMC_UNK
+ mov x0, #SMC_UNK
b restore_gp_registers_callee_eret
smc_prohibited:
ldr x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR]
- mov w0, #SMC_UNK
+ mov x0, #SMC_UNK
eret
rt_svc_fw_critical_error: