diff options
| author | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-02-19 13:36:50 +0000 |
|---|---|---|
| committer | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-02-20 10:27:40 +0000 |
| commit | af10d224865d8af1045ac22e19e55d04f75b3830 (patch) | |
| tree | cfd56dca6180bcfccc6547f863046dba6514204f | |
| parent | 601964294796f2b78f38c3f85cfaeb5885e06f19 (diff) | |
Use consistent SMCCC error code
Removed duplicate error code present for SMCCC and used
proper error code for "SMCCC_ARCH_WORKAROUND_2" call.
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I76fc7c88095f78a7e2c3d205838f8eaf3132ed5c
| -rw-r--r-- | include/services/arm_arch_svc.h | 2 | ||||
| -rw-r--r-- | services/arm_arch_svc/arm_arch_svc_setup.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/services/arm_arch_svc.h b/include/services/arm_arch_svc.h index 23c6f5660..1cb2038c6 100644 --- a/include/services/arm_arch_svc.h +++ b/include/services/arm_arch_svc.h @@ -12,6 +12,4 @@ #define SMCCC_ARCH_WORKAROUND_1 U(0x80008000) #define SMCCC_ARCH_WORKAROUND_2 U(0x80007FFF) -#define SMCCC_ARCH_NOT_REQUIRED -2 - #endif /* ARM_ARCH_SVC_H */ diff --git a/services/arm_arch_svc/arm_arch_svc_setup.c b/services/arm_arch_svc/arm_arch_svc_setup.c index 1fc7827b4..6dac56ec8 100644 --- a/services/arm_arch_svc/arm_arch_svc_setup.c +++ b/services/arm_arch_svc/arm_arch_svc_setup.c @@ -66,7 +66,7 @@ static int32_t smccc_arch_features(u_register_t arg) return 0; #else /* Either the CPUs are unaffected or permanently mitigated */ - return SMCCC_ARCH_NOT_REQUIRED; + return SMC_ARCH_CALL_NOT_REQUIRED; #endif } #endif |