diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2021-12-10 12:22:15 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-12-10 12:22:15 +0100 |
| commit | e7d9c4a9fe8e44a8ea53d786a29019c96ff23ec7 (patch) | |
| tree | 3d8aeb0c8018a340044d8d7b3a4e2fc17016bab6 /include | |
| parent | bbcfa984bb78c2ea63ba9929cf8c89754ccef05e (diff) | |
| parent | 8a4ea96889427fdca49069ee7f9266925692d9e7 (diff) | |
Merge "fix(rme/fid): align RMI FIDs with SMCCC"
Diffstat (limited to 'include')
| -rw-r--r-- | include/runtime_services/realm_payload/realm_payload_test.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/runtime_services/realm_payload/realm_payload_test.h b/include/runtime_services/realm_payload/realm_payload_test.h index c31dd6a..8de3945 100644 --- a/include/runtime_services/realm_payload/realm_payload_test.h +++ b/include/runtime_services/realm_payload/realm_payload_test.h @@ -7,14 +7,14 @@ #include <smccc.h> #include <tftf_lib.h> -#define RMI_FNUM_MIN_VALUE U(0x00) -#define RMI_FNUM_MAX_VALUE U(0x20) +#define RMI_FNUM_MIN_VALUE U(0x150) +#define RMI_FNUM_MAX_VALUE U(0x18F) /* Get RMI fastcall std FID from function number */ #define RMI_FID(smc_cc, func_num) \ ((SMC_TYPE_FAST << FUNCID_TYPE_SHIFT) | \ ((smc_cc) << FUNCID_CC_SHIFT) | \ - (OEN_ARM_START << FUNCID_OEN_SHIFT) | \ + (OEN_STD_START << FUNCID_OEN_SHIFT) | \ ((func_num) << FUNCID_NUM_SHIFT)) /* @@ -23,10 +23,9 @@ * always invoked by the Normal world, forwarded by RMMD and handled by the * RMM */ -#define RMI_FNUM_VERSION_REQ U(0) - -#define RMI_FNUM_GRAN_NS_REALM U(1) -#define RMI_FNUM_GRAN_REALM_NS U(2) +#define RMI_FNUM_VERSION_REQ U(0x150) +#define RMI_FNUM_GRANULE_DELEGATE U(0x151) +#define RMI_FNUM_GRANULE_UNDELEGATE U(0x152) /********************************************************************************/ @@ -34,8 +33,10 @@ /* RMI SMC64 FIDs handled by the RMMD */ #define RMI_RMM_REQ_VERSION RMI_FID(SMC_64, RMI_FNUM_VERSION_REQ) -#define SMC_RMM_GRANULE_DELEGATE RMI_FID(SMC_64, RMI_FNUM_GRAN_NS_REALM) -#define SMC_RMM_GRANULE_UNDELEGATE RMI_FID(SMC_64, RMI_FNUM_GRAN_REALM_NS) +#define SMC_RMM_GRANULE_DELEGATE RMI_FID(SMC_64, \ + RMI_FNUM_GRANULE_DELEGATE) +#define SMC_RMM_GRANULE_UNDELEGATE RMI_FID(SMC_64, \ + RMI_FNUM_GRANULE_UNDELEGATE) #define RMI_ABI_VERSION_GET_MAJOR(_version) ((_version) >> 16) #define RMI_ABI_VERSION_GET_MINOR(_version) ((_version) & 0xFFFF) |