Re: [PATCH v2] firmware: xilinx: Add TF_A_PM_REGISTER_SGI SMC call

[Michal Simek]

On 6/8/22 00:42, Tanmay Shah wrote:
> SGI interrupt register and reset is performed by EEMI ioctl
> IOCTL_REGISTER_SGI. However, this is not correct use of EEMI call.
> SGI registration functionality does not qualify as energy management
> activity and so shouldn't be mapped to EEMI call.
>
> This new call will replace IOCTL_REGISTER_SGI and will  be handled by TF-A
> specific handler in TF-A. To maintain backward compatibility for a while
> firmware driver will still use IOCTL_REGISTER_SGI as fallback strategy if
> new call fails or is not supported by TF-A.
>
> This new design also helps to make TF-A as pass through layer for EEMI
> calls. So we don't have to maintain PM_IOCTL as EEMI API ID in TF-A.
>
> Signed-off-by: Tanmay Shah <tanmay.shah@xxxxxxxxxx>
> ---
>
> Changes in v2:
>    - fix commit tag. add new line before signed-off tag
>
>   drivers/firmware/xilinx/zynqmp.c        | 16 +++++++++++++++-
>   drivers/soc/xilinx/xlnx_event_manager.c |  5 ++---
>   include/linux/firmware/xlnx-zynqmp.h    |  7 +++++++
>   3 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index 7977a494a651..d1f652802181 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -2,7 +2,7 @@
>   /*
>    * Xilinx Zynq MPSoC Firmware layer
>    *
> - *  Copyright (C) 2014-2021 Xilinx, Inc.
> + *  Copyright (C) 2014-2022 Xilinx, Inc.
>    *
>    *  Michal Simek <michal.simek@xxxxxxxxxx>
>    *  Davorin Mista <davorin.mista@xxxxxxxxxx>
> @@ -340,6 +340,20 @@ int zynqmp_pm_invoke_fn(u32 pm_api_id, u32 arg0, u32 arg1,
>   static u32 pm_api_version;
>   static u32 pm_tz_version;
>   
> +int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset)
> +{
> +	int ret;
> +
> +	ret = zynqmp_pm_invoke_fn(TF_A_PM_REGISTER_SGI, sgi_num, reset, 0, 0,
> +				  NULL);
> +	if (!ret)
> +		return ret;
> +
> +	/* try old implementation as fallback strategy if above fails */
> +	return zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_REGISTER_SGI, sgi_num,
> +				   reset, NULL);
> +}
> +
>   /**
>    * zynqmp_pm_get_api_version() - Get version number of PMU PM firmware
>    * @version:	Returned version value
> diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c
> index 5dcb7665fe22..2de082765bef 100644
> --- a/drivers/soc/xilinx/xlnx_event_manager.c
> +++ b/drivers/soc/xilinx/xlnx_event_manager.c
> @@ -647,8 +647,7 @@ static int xlnx_event_manager_probe(struct platform_device *pdev)
>   	cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "soc/event:starting",
>   			  xlnx_event_cpuhp_start, xlnx_event_cpuhp_down);
>   
> -	ret = zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_REGISTER_SGI, sgi_num,
> -				  0, NULL);
> +	ret = zynqmp_pm_register_sgi(sgi_num, 0);
>   	if (ret) {
>   		dev_err(&pdev->dev, "SGI %d Registration over TF-A failed with %d\n", sgi_num, ret);
>   		xlnx_event_cleanup_sgi(pdev);
> @@ -681,7 +680,7 @@ static int xlnx_event_manager_remove(struct platform_device *pdev)
>   		kfree(eve_data);
>   	}
>   
> -	ret = zynqmp_pm_invoke_fn(PM_IOCTL, 0, IOCTL_REGISTER_SGI, 0, 1, NULL);
> +	ret = zynqmp_pm_register_sgi(0, 1);
>   	if (ret)
>   		dev_err(&pdev->dev, "SGI unregistration over TF-A failed with %d\n", ret);
>   
> diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
> index 1ec73d5352c3..cbde3b1fa414 100644
> --- a/include/linux/firmware/xlnx-zynqmp.h
> +++ b/include/linux/firmware/xlnx-zynqmp.h
> @@ -34,6 +34,7 @@
>   #define PM_API_VERSION_2	2
>   
>   /* ATF only commands */
> +#define TF_A_PM_REGISTER_SGI		0xa04
>   #define PM_GET_TRUSTZONE_VERSION	0xa03
>   #define PM_SET_SUSPEND_MODE		0xa02
>   #define GET_CALLBACK_DATA		0xa01
> @@ -468,6 +469,7 @@ int zynqmp_pm_feature(const u32 api_id);
>   int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id);
>   int zynqmp_pm_set_feature_config(enum pm_feature_config_id id, u32 value);
>   int zynqmp_pm_get_feature_config(enum pm_feature_config_id id, u32 *payload);
> +int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset);
>   #else
>   static inline int zynqmp_pm_get_api_version(u32 *version)
>   {
> @@ -733,6 +735,11 @@ static inline int zynqmp_pm_get_feature_config(enum pm_feature_config_id id,
>   {
>   	return -ENODEV;
>   }
> +
> +static inline int zynqmp_pm_register_sgi(u32 sgi_num, u32 reset)
> +{
> +	return -ENODEV;
> +}
>   #endif
>   
>   #endif /* __FIRMWARE_ZYNQMP_H__ */
>
> base-commit: 73d0e32571a0786151eb72634f1a4c5891166176


Applied.
M