Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-27 23:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1270 from antonio-nino-diaz-arm/an/smc-unknown

Browse source 
Redefine SMC_UNK as -1 instead of 0xFFFFFFFF
This commit is contained in:
davidcunado-arm 2018-02-20 09:02:24 +00:00 • committed by GitHub
commit 5ff5a6d9c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bl31/aarch64/runtime_exceptions.S
View file

@ -390,12 +390,12 @@ smc_unknown:
* content). Either way, we aren't leaking any secure information * content). Either way, we aren't leaking any secure information
* through them. * through them.
*/ */
mov w0, #SMC_UNK mov x0, #SMC_UNK
b restore_gp_registers_callee_eret b restore_gp_registers_callee_eret
smc_prohibited: smc_prohibited:
ldr x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR] ldr x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR]
mov w0, #SMC_UNK mov x0, #SMC_UNK
eret eret
rt_svc_fw_critical_error: rt_svc_fw_critical_error:

6
include/lib/smcc.h
View file

@ -35,13 +35,13 @@
#define SMC_64 U(1) #define SMC_64 U(1)
#define SMC_32 U(0) #define SMC_32 U(0)
#define SMC_OK U(0) #define SMC_OK U(0)
#define SMC_UNK U(0xffffffff) #define SMC_UNK -1
#define SMC_TYPE_FAST ULL(1) #define SMC_TYPE_FAST ULL(1)
#if !ERROR_DEPRECATED #if !ERROR_DEPRECATED
#define SMC_TYPE_STD ULL(0) #define SMC_TYPE_STD ULL(0)
#endif #endif
#define SMC_TYPE_YIELD U(0) #define SMC_TYPE_YIELD U(0)
#define SMC_PREEMPTED U(0xfffffffe) #define SMC_PREEMPTED -2
/******************************************************************************* /*******************************************************************************
* Owning entity number definitions inside the function id as per the SMC * Owning entity number definitions inside the function id as per the SMC
* calling convention * calling convention
@ -99,7 +99,7 @@
*/ */
#define DEFINE_SVC_UUID(_name, _tl, _tm, _th, _cl, _ch, \ #define DEFINE_SVC_UUID(_name, _tl, _tm, _th, _cl, _ch, \
_n0, _n1, _n2, _n3, _n4, _n5) \ _n0, _n1, _n2, _n3, _n4, _n5) \
CASSERT(_tl != SMC_UNK, invalid_svc_uuid);\ CASSERT((uint32_t)(_tl) != (uint32_t) SMC_UNK, invalid_svc_uuid);\
static const uuid_t _name = { \ static const uuid_t _name = { \
_tl, _tm, _th, _cl, _ch, \ _tl, _tm, _th, _cl, _ch, \
{ _n0, _n1, _n2, _n3, _n4, _n5 } \ { _n0, _n1, _n2, _n3, _n4, _n5 } \