diff options
| author | J-Alves <joao.alves@arm.com> | 2020-05-26 14:03:05 +0100 |
|---|---|---|
| committer | J-Alves <joao.alves@arm.com> | 2020-06-23 15:08:48 +0100 |
| commit | 4388f28f0fdbc8deba4e786c776a56ae2c4d4887 (patch) | |
| tree | e40739446fe2177762a8fb94c527ca5b231d81e0 /services | |
| parent | 3fbec43648e221769c793909950eb96f12309625 (diff) | |
FFA Version interface update
Change handler of FFA version interface:
- Return SPMD's version if the origin of the call is secure;
- Return SPMC's version if origin is non-secure.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I0d1554da79b72b1e02da6cc363a2288119c32f44
Diffstat (limited to 'services')
| -rw-r--r-- | services/std_svc/spmd/spmd_main.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c index a818037cb..4c2b58df2 100644 --- a/services/std_svc/spmd/spmd_main.c +++ b/services/std_svc/spmd/spmd_main.c @@ -350,6 +350,7 @@ uint64_t spmd_smc_handler(uint32_t smc_fid, spmd_spm_core_context_t *ctx = spmd_get_context(); bool secure_origin; int32_t ret; + uint32_t input_version; /* Determine which security state this SMC originated from */ secure_origin = is_caller_secure(flags); @@ -375,15 +376,24 @@ uint64_t spmd_smc_handler(uint32_t smc_fid, break; /* not reached */ case FFA_VERSION: + input_version = (uint32_t)(0xFFFFFFFF & x1); /* - * TODO: This is an optimization that the version information - * provided by the SPM Core manifest is returned by the SPM - * dispatcher. It might be a better idea to simply forward this - * call to the SPM Core and wash our hands completely. + * If caller is secure and SPMC was initialized, + * return FFA_VERSION of SPMD. + * If caller is non secure and SPMC was initialized, + * return SPMC's version. + * Sanity check to "input_version". */ - ret = MAKE_FFA_VERSION(spmc_attrs.major_version, - spmc_attrs.minor_version); - SMC_RET8(handle, FFA_SUCCESS_SMC32, FFA_TARGET_INFO_MBZ, ret, + if ((input_version & FFA_VERSION_BIT31_MASK) || + (ctx->state == SPMC_STATE_RESET)) { + ret = FFA_ERROR_NOT_SUPPORTED; + } else if (!secure_origin) { + ret = MAKE_FFA_VERSION(spmc_attrs.major_version, spmc_attrs.minor_version); + } else { + ret = MAKE_FFA_VERSION(FFA_VERSION_MAJOR, FFA_VERSION_MINOR); + } + + SMC_RET8(handle, ret, FFA_TARGET_INFO_MBZ, FFA_TARGET_INFO_MBZ, FFA_PARAM_MBZ, FFA_PARAM_MBZ, FFA_PARAM_MBZ, FFA_PARAM_MBZ, FFA_PARAM_MBZ); break; /* not reached */ |