[U-Boot] [PATCH 06/13] arm64: zynqmp: Cleanup PM SMC macro composition

[Luca Ceresoli]

Hi Michal,

On 27/09/19 15:34, Michal Simek wrote:
> Cleanup PM ID handling by using enum values.
> 
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza at xilinx.com>
> ---
> 
>  arch/arm/mach-zynqmp/include/mach/sys_proto.h | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
> index f25d414dcb1e..573c4ffceed9 100644
> --- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
> +++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
> @@ -10,7 +10,8 @@
>  #define PAYLOAD_ARG_CNT		5
>  
>  #define ZYNQMP_CSU_SILICON_VER_MASK	0xF
> -#define ZYNQMP_SIP_SVC_PM_SECURE_IMG_LOAD	0xC200002D
> +#define ZYNQMP_SIP_SVC_PM_SECURE_IMG_LOAD	\
> +	(PM_SIP_SVC + PM_SECURE_IMAGE)
>  #define KEY_PTR_LEN	32
>  
>  #define ZYNQMP_FPGA_BIT_AUTH_DDR	1
> @@ -21,7 +22,8 @@
>  
>  #define ZYNQMP_FPGA_AUTH_DDR	1
>  
> -#define ZYNQMP_SIP_SVC_GET_API_VERSION		0xC2000001
> +#define ZYNQMP_SIP_SVC_GET_API_VERSION		\
> +	(PM_SIP_SVC + PM_GET_API_VERSION)
>  
>  #define ZYNQMP_PM_VERSION_MAJOR		1
>  #define ZYNQMP_PM_VERSION_MINOR		0
> @@ -36,6 +38,13 @@
>  
>  #define PMUFW_V1_0	((1 << ZYNQMP_PM_VERSION_MAJOR_SHIFT) | 0)
>  
> +#define PM_SIP_SVC	0xc2000000
> +
> +enum pm_api_id {
> +	PM_GET_API_VERSION = 1,
> +	PM_SECURE_IMAGE = 45,
> +};
> +

This is a matter of personal taste, but I prefer to define values before
using them. So unless there is a good reason to define these values here
I'd rather move them before.

-- 
Luca