[PATCH] clk: zynqmp: handle fixed factor param query error

[PATCH] clk: zynqmp: handle fixed factor param query error

[Rajan Vaja]

Return proper error code in case query for fixed factor
parameter fails. This also fixes build warning for set
but not used variable 'ret'.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
---
 drivers/clk/zynqmp/clkc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 9d7d297..297f16a 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -279,6 +279,9 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id,
 	qdata.arg1 = clk_id;
 
 	ret = eemi_ops->query_data(qdata, ret_payload);
+	if (ret)
+		return ERR_PTR(ret);
+
 	mult = ret_payload[1];
 	div = ret_payload[2];
 
-- 
2.7.4

[PATCH] clk: zynqmp: handle fixed factor param query error

[Rajan Vaja]

Return proper error code in case query for fixed factor
parameter fails. This also fixes build warning for set
but not used variable 'ret'.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
---
 drivers/clk/zynqmp/clkc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 9d7d297..297f16a 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -279,6 +279,9 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id,
 	qdata.arg1 = clk_id;
 
 	ret = eemi_ops->query_data(qdata, ret_payload);
+	if (ret)
+		return ERR_PTR(ret);
+
 	mult = ret_payload[1];
 	div = ret_payload[2];
 
-- 
2.7.4

Re: [PATCH] clk: zynqmp: handle fixed factor param query error

[Stephen Boyd]

Quoting Rajan Vaja (2018-10-17 00:46:32)
> Return proper error code in case query for fixed factor
> parameter fails. This also fixes build warning for set
> but not used variable 'ret'.
> 
> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>

Fixes tag? And I think this is going through arm-soc already? If so,

Acked-by: Stephen Boyd <sboyd@kernel.org>

with the appropriate fixes tag added.

[PATCH] clk: zynqmp: handle fixed factor param query error

[Stephen Boyd]

Quoting Rajan Vaja (2018-10-17 00:46:32)
> Return proper error code in case query for fixed factor
> parameter fails. This also fixes build warning for set
> but not used variable 'ret'.
> 
> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>

Fixes tag? And I think this is going through arm-soc already? If so,

Acked-by: Stephen Boyd <sboyd@kernel.org>

with the appropriate fixes tag added.

Re: [PATCH] clk: zynqmp: handle fixed factor param query error

[Michal Simek]

On 17. 10. 18 17:22, Stephen Boyd wrote:
> Quoting Rajan Vaja (2018-10-17 00:46:32)
>> Return proper error code in case query for fixed factor
>> parameter fails. This also fixes build warning for set
>> but not used variable 'ret'.
>>
>> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> 
> Fixes tag? And I think this is going through arm-soc already? If so,
> 
> Acked-by: Stephen Boyd <sboyd@kernel.org>
> 
> with the appropriate fixes tag added.

It was really just about to merge this via arm-soc tree because of
dependency on firmware itself.
It is the part of v4.20-rc1 now and it can go via your tree.

Anyway v2 is required with Fixed tag anyway.
Rajan: Please send it v2 with Acked above.

Thanks,
Michal

[PATCH] clk: zynqmp: handle fixed factor param query error

[Michal Simek]

On 17. 10. 18 17:22, Stephen Boyd wrote:
> Quoting Rajan Vaja (2018-10-17 00:46:32)
>> Return proper error code in case query for fixed factor
>> parameter fails. This also fixes build warning for set
>> but not used variable 'ret'.
>>
>> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> 
> Fixes tag? And I think this is going through arm-soc already? If so,
> 
> Acked-by: Stephen Boyd <sboyd@kernel.org>
> 
> with the appropriate fixes tag added.

It was really just about to merge this via arm-soc tree because of
dependency on firmware itself.
It is the part of v4.20-rc1 now and it can go via your tree.

Anyway v2 is required with Fixed tag anyway.
Rajan: Please send it v2 with Acked above.

Thanks,
Michal

[PATCH v2] clk: zynqmp: handle fixed factor param query error

[Rajan Vaja]

Return proper error code in case query for fixed factor
parameter fails. This also fixes build warning for set
but not used variable 'ret'.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
Acked-by: Stephen Boyd <sboyd@kernel.org>
---
Changes in v2:
  * Add Fixes tag
---
 drivers/clk/zynqmp/clkc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 9d7d297..297f16a 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -279,6 +279,9 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id,
 	qdata.arg1 = clk_id;
 
 	ret = eemi_ops->query_data(qdata, ret_payload);
+	if (ret)
+		return ERR_PTR(ret);
+
 	mult = ret_payload[1];
 	div = ret_payload[2];
 
-- 
2.7.4

[PATCH v2] clk: zynqmp: handle fixed factor param query error

[Rajan Vaja]

Return proper error code in case query for fixed factor
parameter fails. This also fixes build warning for set
but not used variable 'ret'.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
Acked-by: Stephen Boyd <sboyd@kernel.org>
---
Changes in v2:
  * Add Fixes tag
---
 drivers/clk/zynqmp/clkc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 9d7d297..297f16a 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -279,6 +279,9 @@ struct clk_hw *zynqmp_clk_register_fixed_factor(const char *name, u32 clk_id,
 	qdata.arg1 = clk_id;
 
 	ret = eemi_ops->query_data(qdata, ret_payload);
+	if (ret)
+		return ERR_PTR(ret);
+
 	mult = ret_payload[1];
 	div = ret_payload[2];
 
-- 
2.7.4

RE: [PATCH] clk: zynqmp: handle fixed factor param query error

[Rajan Vaja]

Hi Michal, Stephen,

> -----Original Message-----
> From: Michal Simek [mailto:michal.simek@xilinx.com]
> Sent: 05 November 2018 01:09 PM
> To: Stephen Boyd <sboyd@kernel.org>; Rajan Vaja <RAJANV@xilinx.com>; Michal
> Simek <michals@xilinx.com>; mturquette@baylibre.com; olof@lixom.net;
> Shubhrajyoti Datta <shubhraj@xilinx.com>
> Cc: Jolly Shah <JOLLYS@xilinx.com>; linux-clk@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH] clk: zynqmp: handle fixed factor param query error
> 
> On 17. 10. 18 17:22, Stephen Boyd wrote:
> > Quoting Rajan Vaja (2018-10-17 00:46:32)
> >> Return proper error code in case query for fixed factor
> >> parameter fails. This also fixes build warning for set
> >> but not used variable 'ret'.
> >>
> >> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> >
> > Fixes tag? And I think this is going through arm-soc already? If so,
> >
> > Acked-by: Stephen Boyd <sboyd@kernel.org>
> >
> > with the appropriate fixes tag added.
> 
> It was really just about to merge this via arm-soc tree because of
> dependency on firmware itself.
> It is the part of v4.20-rc1 now and it can go via your tree.
> 
> Anyway v2 is required with Fixed tag anyway.
> Rajan: Please send it v2 with Acked above.
[Rajan] I have submitted v2 with Fixes tag and Ack.

> 
> Thanks,
> Michal

[PATCH] clk: zynqmp: handle fixed factor param query error

[Rajan Vaja]

Hi Michal, Stephen,

> -----Original Message-----
> From: Michal Simek [mailto:michal.simek at xilinx.com]
> Sent: 05 November 2018 01:09 PM
> To: Stephen Boyd <sboyd@kernel.org>; Rajan Vaja <RAJANV@xilinx.com>; Michal
> Simek <michals@xilinx.com>; mturquette at baylibre.com; olof at lixom.net;
> Shubhrajyoti Datta <shubhraj@xilinx.com>
> Cc: Jolly Shah <JOLLYS@xilinx.com>; linux-clk at vger.kernel.org; linux-arm-
> kernel at lists.infradead.org
> Subject: Re: [PATCH] clk: zynqmp: handle fixed factor param query error
> 
> On 17. 10. 18 17:22, Stephen Boyd wrote:
> > Quoting Rajan Vaja (2018-10-17 00:46:32)
> >> Return proper error code in case query for fixed factor
> >> parameter fails. This also fixes build warning for set
> >> but not used variable 'ret'.
> >>
> >> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> >
> > Fixes tag? And I think this is going through arm-soc already? If so,
> >
> > Acked-by: Stephen Boyd <sboyd@kernel.org>
> >
> > with the appropriate fixes tag added.
> 
> It was really just about to merge this via arm-soc tree because of
> dependency on firmware itself.
> It is the part of v4.20-rc1 now and it can go via your tree.
> 
> Anyway v2 is required with Fixed tag anyway.
> Rajan: Please send it v2 with Acked above.
[Rajan] I have submitted v2 with Fixes tag and Ack.

> 
> Thanks,
> Michal

Re: [PATCH v2] clk: zynqmp: handle fixed factor param query error

[Stephen Boyd]

Quoting Rajan Vaja (2018-11-13 23:46:49)
> Return proper error code in case query for fixed factor
> parameter fails. This also fixes build warning for set
> but not used variable 'ret'.
> 
> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
> Acked-by: Stephen Boyd <sboyd@kernel.org>
> ---

Applied to clk-fixes

[PATCH v2] clk: zynqmp: handle fixed factor param query error

[Stephen Boyd]

Quoting Rajan Vaja (2018-11-13 23:46:49)
> Return proper error code in case query for fixed factor
> parameter fails. This also fixes build warning for set
> but not used variable 'ret'.
> 
> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
> Acked-by: Stephen Boyd <sboyd@kernel.org>
> ---

Applied to clk-fixes