From af10d224865d8af1045ac22e19e55d04f75b3830 Mon Sep 17 00:00:00 2001 From: Manish V Badarkhe Date: Wed, 19 Feb 2020 13:36:50 +0000 Subject: [PATCH] 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 Change-Id: I76fc7c88095f78a7e2c3d205838f8eaf3132ed5c --- include/services/arm_arch_svc.h | 2 -- services/arm_arch_svc/arm_arch_svc_setup.c | 2 +- 2 files changed, 1 insertion(+), 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