[edk2-devel] [PATCH 1/5] ArmPkg/IndustryStandard: 32b/64b agnostic FF-A and Mm SVC IDs

[Sami Mujawar]

Hi Etienn,

This patch looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar at arm.com>

Regards,

Sami Mujawar


On 04/05/2021 04:20 PM, Etienne Carriere wrote:
> Defines ARM_SVC_ID_FFA_* and ARM_SVC_ID_SP_* identifiers for 32bit
> function IDs as per SMCCC specification. Defines also generic ARM
> SVC identifier macros to wrap 32bit or 64bit identifiers upon target
> built architecture.
>
> Cc: Achin Gupta <achin.gupta at arm.com>
> Cc: Ard Biesheuvel <ardb+tianocore at kernel.org>
> Cc: Leif Lindholm <leif at nuviainc.com>
> Cc: Sughosh Ganu <sughosh.ganu at linaro.org>
> Signed-off-by: Etienne Carriere <etienne.carriere at linaro.org>
> ---
>   ArmPkg/Include/IndustryStandard/ArmFfaSvc.h | 12 ++++++++++++
>   ArmPkg/Include/IndustryStandard/ArmMmSvc.h  | 15 +++++++++++++++
>   2 files changed, 27 insertions(+)
>
> diff --git a/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h b/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h
> index 65b8343ade..ebcb54b28b 100644
> --- a/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h
> +++ b/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h
> @@ -17,9 +17,21 @@
>   #define ARM_FFA_SVC_H_
>   
>   #define ARM_SVC_ID_FFA_VERSION_AARCH32                  0x84000063
> +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH32      0x8400006F
> +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH32     0x84000070
>   #define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64      0xC400006F
>   #define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64     0xC4000070
>   
> +/* Generic IDs when using AArch32 or AArch64 execution state */
> +#ifdef MDE_CPU_AARCH64
> +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ     ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64
> +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP    ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64
> +#endif
> +#ifdef MDE_CPU_ARM
> +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ     ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH32
> +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP    ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH32
> +#endif
> +
>   #define SPM_MAJOR_VERSION_FFA                           1
>   #define SPM_MINOR_VERSION_FFA                           0
>   
> diff --git a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
> index 33d60ccf17..deb3bc99d2 100644
> --- a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
> +++ b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
> @@ -15,10 +15,25 @@
>    * privileged operations on its behalf.
>    */
>   #define ARM_SVC_ID_SPM_VERSION_AARCH32             0x84000060
> +#define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH32       0x84000061
> +#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH32   0x84000064
> +#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH32   0x84000065
>   #define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64       0xC4000061
>   #define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64   0xC4000064
>   #define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64   0xC4000065
>   
> +/* Generic IDs when using AArch32 or AArch64 execution state */
> +#ifdef MDE_CPU_AARCH64
> +#define ARM_SVC_ID_SP_EVENT_COMPLETE               ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64
> +#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64
> +#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64
> +#endif
> +#ifdef MDE_CPU_ARM
> +#define ARM_SVC_ID_SP_EVENT_COMPLETE               ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH32
> +#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH32
> +#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES       ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH32
> +#endif
> +
>   #define SET_MEM_ATTR_DATA_PERM_MASK       0x3
>   #define SET_MEM_ATTR_DATA_PERM_SHIFT        0
>   #define SET_MEM_ATTR_DATA_PERM_NO_ACCESS    0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75028): https://edk2.groups.io/g/devel/message/75028
Mute This Topic: https://groups.io/mt/82580245/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-