diff options
author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2020-07-28 18:31:47 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-07-28 18:31:47 +0000 |
commit | a6151e7c85ee602cf5cd018e2e3ca465e8af9a85 (patch) | |
tree | def8effd4b20ab11f9a333bb9184784bd89418f4 /services/arm_arch_svc/arm_arch_svc_setup.c | |
parent | 894eb3eefaaf4c3ed2c313badce1e94dbfc541d4 (diff) | |
parent | 6f0a2f04abd6f75c8f9e16c3f06c27609c49568a (diff) | |
download | trusted-firmware-a-a6151e7c85ee602cf5cd018e2e3ca465e8af9a85.tar.gz |
Merge "SMCCC: Introduce function to check SMCCC function availability" into integration
Diffstat (limited to 'services/arm_arch_svc/arm_arch_svc_setup.c')
-rw-r--r-- | services/arm_arch_svc/arm_arch_svc_setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/arm_arch_svc/arm_arch_svc_setup.c b/services/arm_arch_svc/arm_arch_svc_setup.c index 588656d57f..37bfc62e2b 100644 --- a/services/arm_arch_svc/arm_arch_svc_setup.c +++ b/services/arm_arch_svc/arm_arch_svc_setup.c @@ -24,8 +24,9 @@ static int32_t smccc_arch_features(u_register_t arg1) switch (arg1) { case SMCCC_VERSION: case SMCCC_ARCH_FEATURES: + return SMC_ARCH_CALL_SUCCESS; case SMCCC_ARCH_SOC_ID: - return SMC_OK; + return plat_is_smccc_feature_available(arg1); #if WORKAROUND_CVE_2017_5715 case SMCCC_ARCH_WORKAROUND_1: if (check_wa_cve_2017_5715() == ERRATA_NOT_APPLIES) |