2021-10-06 08:46:14

by Rajan Vaja

Subject: [PATCH] firmware: xilinx: check return value of zynqmp_pm_get_api_version()

Currently return value of zynqmp_pm_get_api_version() is ignored.
Because of that, API version is checked in case of error also.
So add check for return value of zynqmp_pm_get_api_version().

Signed-off-by: Rajan Vaja <[email protected]>
---
drivers/firmware/xilinx/zynqmp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index a3cadba..070197e 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -1371,7 +1371,10 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
return ret;

/* Check PM API version number */
- zynqmp_pm_get_api_version(&pm_api_version);
+ ret = zynqmp_pm_get_api_version(&pm_api_version);
+ if (ret)
+ return ret;
+
if (pm_api_version < ZYNQMP_PM_VERSION) {
panic("%s Platform Management API version error. Expected: v%d.%d - Found: v%d.%d\n",
__func__,
--
2.7.4

2021-10-06 08:55:05

by Michal Simek

Subject: Re: [PATCH] firmware: xilinx: check return value of zynqmp_pm_get_api_version()

On 10/6/21 10:43 AM, Rajan Vaja wrote:
> Currently return value of zynqmp_pm_get_api_version() is ignored.
> Because of that, API version is checked in case of error also.
> So add check for return value of zynqmp_pm_get_api_version().
>
> Signed-off-by: Rajan Vaja <[email protected]>
> ---
> drivers/firmware/xilinx/zynqmp.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index a3cadba..070197e 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -1371,7 +1371,10 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
> return ret;
>
> /* Check PM API version number */
> - zynqmp_pm_get_api_version(&pm_api_version);
> + ret = zynqmp_pm_get_api_version(&pm_api_version);
> + if (ret)
> + return ret;
> +
> if (pm_api_version < ZYNQMP_PM_VERSION) {
> panic("%s Platform Management API version error. Expected: v%d.%d - Found: v%d.%d\n",
> __func__,
>

Reviewed-by: Michal Simek <[email protected]>

Thanks,
Michal

2021-10-18 13:16:33

by Michal Simek

Subject: Re: [PATCH] firmware: xilinx: check return value of zynqmp_pm_get_api_version()

On 10/6/21 10:43, Rajan Vaja wrote:
> Currently return value of zynqmp_pm_get_api_version() is ignored.
> Because of that, API version is checked in case of error also.
> So add check for return value of zynqmp_pm_get_api_version().
>
> Signed-off-by: Rajan Vaja <[email protected]>
> ---
> drivers/firmware/xilinx/zynqmp.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index a3cadba..070197e 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -1371,7 +1371,10 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
> return ret;
>
> /* Check PM API version number */
> - zynqmp_pm_get_api_version(&pm_api_version);
> + ret = zynqmp_pm_get_api_version(&pm_api_version);
> + if (ret)
> + return ret;
> +
> if (pm_api_version < ZYNQMP_PM_VERSION) {
> panic("%s Platform Management API version error. Expected: v%d.%d - Found: v%d.%d\n",
> __func__,
>

Applied.
M