diff options
author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-05-08 18:18:34 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-05-08 18:18:34 +0000 |
commit | 4e2887f2da05dc510e9ce1e9d648ef2b5d745649 (patch) | |
tree | 9cf949e1fe41bb6dea4cca09974992f0133fc49b | |
parent | 7bf5832c3d12061398bc727b10a3e0adb0bb06b5 (diff) | |
parent | a718c3d677f8b3a65db766406e8c7df25af02529 (diff) | |
download | trusted-firmware-a-4e2887f2da05dc510e9ce1e9d648ef2b5d745649.tar.gz |
Merge "Fix SMCCC_ARCH_SOC_ID implementation" into integration
-rw-r--r-- | services/arm_arch_svc/arm_arch_svc_setup.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/services/arm_arch_svc/arm_arch_svc_setup.c b/services/arm_arch_svc/arm_arch_svc_setup.c index ba539309de..588656d57f 100644 --- a/services/arm_arch_svc/arm_arch_svc_setup.c +++ b/services/arm_arch_svc/arm_arch_svc_setup.c @@ -19,20 +19,13 @@ static int32_t smccc_version(void) return MAKE_SMCCC_VERSION(SMCCC_MAJOR_VERSION, SMCCC_MINOR_VERSION); } -static int32_t smccc_arch_features(u_register_t arg1, u_register_t arg2) +static int32_t smccc_arch_features(u_register_t arg1) { switch (arg1) { case SMCCC_VERSION: case SMCCC_ARCH_FEATURES: - return SMC_OK; case SMCCC_ARCH_SOC_ID: - if (arg2 == SMCCC_GET_SOC_REVISION) { - return plat_get_soc_revision(); - } - if (arg2 == SMCCC_GET_SOC_VERSION) { - return plat_get_soc_version(); - } - return SMC_ARCH_CALL_INVAL_PARAM; + return SMC_OK; #if WORKAROUND_CVE_2017_5715 case SMCCC_ARCH_WORKAROUND_1: if (check_wa_cve_2017_5715() == ERRATA_NOT_APPLIES) @@ -87,6 +80,19 @@ static int32_t smccc_arch_features(u_register_t arg1, u_register_t arg2) } } +/* return soc revision or soc version on success otherwise + * return invalid parameter */ +static int32_t smccc_arch_id(u_register_t arg1) +{ + if (arg1 == SMCCC_GET_SOC_REVISION) { + return plat_get_soc_revision(); + } + if (arg1 == SMCCC_GET_SOC_VERSION) { + return plat_get_soc_version(); + } + return SMC_ARCH_CALL_INVAL_PARAM; +} + /* * Top-level Arm Architectural Service SMC handler. */ @@ -103,7 +109,9 @@ static uintptr_t arm_arch_svc_smc_handler(uint32_t smc_fid, case SMCCC_VERSION: SMC_RET1(handle, smccc_version()); case SMCCC_ARCH_FEATURES: - SMC_RET1(handle, smccc_arch_features(x1, x2)); + SMC_RET1(handle, smccc_arch_features(x1)); + case SMCCC_ARCH_SOC_ID: + SMC_RET1(handle, smccc_arch_id(x1)); #if WORKAROUND_CVE_2017_5715 case SMCCC_ARCH_WORKAROUND_1: /* |