andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use consistent SMCCC error code" into integration

This commit is contained in:
Mark Dykes 2020-02-21 15:47:30 +00:00 committed by TrustedFirmware Code Review
parent b1f97e41c0 af10d22486
commit b3c287f472
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/services/arm_arch_svc.h
View File

@ -12,6 +12,4 @@
#define SMCCC_ARCH_WORKAROUND_1 U(0x80008000) #define SMCCC_ARCH_WORKAROUND_1 U(0x80008000)
#define SMCCC_ARCH_WORKAROUND_2 U(0x80007FFF) #define SMCCC_ARCH_WORKAROUND_2 U(0x80007FFF)
#define SMCCC_ARCH_NOT_REQUIRED -2
#endif /* ARM_ARCH_SVC_H */ #endif /* ARM_ARCH_SVC_H */

2
services/arm_arch_svc/arm_arch_svc_setup.c
View File

@ -66,7 +66,7 @@ static int32_t smccc_arch_features(u_register_t arg)
return 0; return 0;
#else #else
/* Either the CPUs are unaffected or permanently mitigated */ /* Either the CPUs are unaffected or permanently mitigated */
return SMCCC_ARCH_NOT_REQUIRED; return SMC_ARCH_CALL_NOT_REQUIRED;
#endif #endif
} }
#endif #endif