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

diff --git a/include/services/arm_arch_svc.h b/include/services/arm_arch_svc.h
index 23c6f566032686202698ad910936f641712a5a8d..1cb2038c6a2edf12e7a05c121f16d4050af4d1df 100644 (file)
--- 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 1fc7827b4d8d07bf7cc1348be7e1179a09b96e98..6dac56ec81a96c4f527fcaf533557eeead5c4fef 100644 (file)
--- 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