diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-02-21 15:47:30 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-21 15:47:30 +0000 |
| commit | b3c287f472ece894e0b57c925c451e15f73bddc3 (patch) | |
| tree | f95bfad850d2e58139767ae7e008820fe7775125 | |
| parent | b1f97e41c02b38d5edc399b569ad78793d66d0f2 (diff) | |
| parent | af10d224865d8af1045ac22e19e55d04f75b3830 (diff) | |
| download | platform_external_arm-trusted-firmware-b3c287f472ece894e0b57c925c451e15f73bddc3.tar.gz platform_external_arm-trusted-firmware-b3c287f472ece894e0b57c925c451e15f73bddc3.tar.bz2 platform_external_arm-trusted-firmware-b3c287f472ece894e0b57c925c451e15f73bddc3.zip | |
Merge "Use consistent SMCCC error code" into integration
| -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 |