diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2021-09-27 16:54:53 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-09-27 16:54:53 +0200 |
commit | c7c22ab662008ca6cfb8b1926bbaa5fdc8eb399e (patch) | |
tree | 551991f914c8f178cea2808b6157cef7f29dd97c | |
parent | ab5964aadcf090c816804a798c0d49bc0c9b5183 (diff) | |
parent | fc3f480023e3a52460add25f18dd550dde44d9ff (diff) |
Merge "feat(ff-a): adding notifications SMC IDs" into integration
-rw-r--r-- | include/services/ffa_svc.h | 12 | ||||
-rw-r--r-- | services/std_svc/spmd/spmd_main.c | 14 |
2 files changed, 24 insertions, 2 deletions
diff --git a/include/services/ffa_svc.h b/include/services/ffa_svc.h index ab36d9e1f6..85ff703bcb 100644 --- a/include/services/ffa_svc.h +++ b/include/services/ffa_svc.h @@ -128,6 +128,16 @@ #define FFA_MEM_RETRIEVE_RESP FFA_FID(SMC_32, FFA_FNUM_MEM_RETRIEVE_RESP) #define FFA_MEM_RELINQUISH FFA_FID(SMC_32, FFA_FNUM_MEM_RELINQUISH) #define FFA_MEM_RECLAIM FFA_FID(SMC_32, FFA_FNUM_MEM_RECLAIM) +#define FFA_NOTIFICATION_BITMAP_CREATE \ + FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_BITMAP_CREATE) +#define FFA_NOTIFICATION_BITMAP_DESTROY \ + FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_BITMAP_DESTROY) +#define FFA_NOTIFICATION_BIND FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_BIND) +#define FFA_NOTIFICATION_UNBIND FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_UNBIND) +#define FFA_NOTIFICATION_SET FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_SET) +#define FFA_NOTIFICATION_GET FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_GET) +#define FFA_NOTIFICATION_INFO_GET \ + FFA_FID(SMC_32, FFA_FNUM_NOTIFICATION_INFO_GET) #define FFA_SPM_ID_GET FFA_FID(SMC_32, FFA_FNUM_SPM_ID_GET) /* FFA SMC64 FIDs */ @@ -145,6 +155,8 @@ FFA_FID(SMC_64, FFA_FNUM_MEM_RETRIEVE_REQ) #define FFA_SECONDARY_EP_REGISTER_SMC64 \ FFA_FID(SMC_64, FFA_FNUM_SECONDARY_EP_REGISTER) +#define FFA_NOTIFICATION_INFO_GET_SMC64 \ + FFA_FID(SMC_64, FFA_FNUM_NOTIFICATION_INFO_GET) /* * Reserve a special value for traffic targeted to the Hypervisor or SPM. diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c index 0706c45db4..6de5feb0e0 100644 --- a/services/std_svc/spmd/spmd_main.c +++ b/services/std_svc/spmd/spmd_main.c @@ -616,9 +616,19 @@ uint64_t spmd_smc_handler(uint32_t smc_fid, case FFA_RXTX_MAP_SMC64: case FFA_RXTX_UNMAP: case FFA_PARTITION_INFO_GET: +#if MAKE_FFA_VERSION(1, 1) <= FFA_VERSION_COMPILED + case FFA_NOTIFICATION_BITMAP_CREATE: + case FFA_NOTIFICATION_BITMAP_DESTROY: + case FFA_NOTIFICATION_BIND: + case FFA_NOTIFICATION_UNBIND: + case FFA_NOTIFICATION_SET: + case FFA_NOTIFICATION_GET: + case FFA_NOTIFICATION_INFO_GET: + case FFA_NOTIFICATION_INFO_GET_SMC64: +#endif /* - * Should not be allowed to forward FFA_PARTITION_INFO_GET - * from Secure world to Normal world + * Above calls should not be forwarded from Secure world to + * Normal world. * * Fall through to forward the call to the other world */ |