[PATCH] clk: vc5: Avoid divide by zero when rounding or setting rates

[PATCH] clk: vc5: Avoid divide by zero when rounding or setting rates

[Steve Longerbeam]

Add checks in the .round_rate and .set_rate ops for zero requested
rate or zero parent rate. If either are zero in .round_rate, just
return zero. If either are zero in .set_rate, return -EINVAL.

Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
 drivers/clk/clk-versaclock5.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/clk/clk-versaclock5.c b/drivers/clk/clk-versaclock5.c
index decffb3..5524e5d 100644
--- a/drivers/clk/clk-versaclock5.c
+++ b/drivers/clk/clk-versaclock5.c
@@ -304,6 +304,9 @@ static int vc5_dbl_set_rate(struct clk_hw *hw, unsigned long rate,
 		container_of(hw, struct vc5_driver_data, clk_mul);
 	u32 mask;
 
+	if (parent_rate == 0 || rate == 0)
+		return -EINVAL;
+
 	if ((parent_rate * 2) == rate)
 		mask = VC5_PRIM_SRC_SHDN_EN_DOUBLE_XTAL_FREQ;
 	else
@@ -349,6 +352,10 @@ static long vc5_pfd_round_rate(struct clk_hw *hw, unsigned long rate,
 {
 	unsigned long idiv;
 
+	/* avoid division by zero */
+	if (*parent_rate == 0 || rate == 0)
+		return 0;
+
 	/* PLL cannot operate with input clock above 50 MHz. */
 	if (rate > 50000000)
 		return -EINVAL;
@@ -372,6 +379,10 @@ static int vc5_pfd_set_rate(struct clk_hw *hw, unsigned long rate,
 	unsigned long idiv;
 	u8 div;
 
+	/* avoid division by zero */
+	if (parent_rate == 0 || rate == 0)
+		return -EINVAL;
+
 	/* CLKIN within range of PLL input, feed directly to PLL. */
 	if (parent_rate <= 50000000) {
 		regmap_update_bits(vc5->regmap, VC5_VCO_CTRL_AND_PREDIV,
@@ -429,6 +440,10 @@ static long vc5_pll_round_rate(struct clk_hw *hw, unsigned long rate,
 	u32 div_int;
 	u64 div_frc;
 
+	/* avoid division by zero */
+	if (*parent_rate == 0 || rate == 0)
+		return 0;
+
 	if (rate < VC5_PLL_VCO_MIN)
 		rate = VC5_PLL_VCO_MIN;
 	if (rate > VC5_PLL_VCO_MAX)
@@ -457,6 +472,9 @@ static int vc5_pll_set_rate(struct clk_hw *hw, unsigned long rate,
 	struct vc5_driver_data *vc5 = hwdata->vc5;
 	u8 fb[5];
 
+	if (parent_rate == 0 || rate == 0)
+		return -EINVAL;
+
 	fb[0] = hwdata->div_int >> 4;
 	fb[1] = hwdata->div_int << 4;
 	fb[2] = hwdata->div_frc >> 16;
@@ -509,6 +527,10 @@ static long vc5_fod_round_rate(struct clk_hw *hw, unsigned long rate,
 	u32 div_int;
 	u64 div_frc;
 
+	/* avoid division by zero */
+	if (*parent_rate == 0 || rate == 0)
+		return 0;
+
 	/* Determine integer part, which is 12 bit wide */
 	div_int = f_in / rate;
 	/*
@@ -546,6 +568,9 @@ static int vc5_fod_set_rate(struct clk_hw *hw, unsigned long rate,
 		0
 	};
 
+	if (parent_rate == 0 || rate == 0)
+		return -EINVAL;
+
 	regmap_bulk_write(vc5->regmap, VC5_OUT_DIV_FRAC(hwdata->num, 0),
 			  data, 14);
 
-- 
2.7.4

Re: [PATCH] clk: vc5: Avoid divide by zero when rounding or setting rates

[Stephen Boyd]

Quoting Steve Longerbeam (2018-05-31 18:59:17)
> Add checks in the .round_rate and .set_rate ops for zero requested
> rate or zero parent rate. If either are zero in .round_rate, just
> return zero. If either are zero in .set_rate, return -EINVAL.

Are you seeing problems when the clk is unparented and we're trying to
recalculate the rate or change rates, and thus the parent frequency
looks like 0? Should this get a Fixes: tag so that it goes back to
stable kernels?

Re: [PATCH] clk: vc5: Avoid divide by zero when rounding or setting rates

[Steve Longerbeam]

On 07/06/2018 11:23 AM, Stephen Boyd wrote:
> Quoting Steve Longerbeam (2018-05-31 18:59:17)
>> Add checks in the .round_rate and .set_rate ops for zero requested
>> rate or zero parent rate. If either are zero in .round_rate, just
>> return zero. If either are zero in .set_rate, return -EINVAL.
> Are you seeing problems when the clk is unparented and we're trying to
> recalculate the rate or change rates, and thus the parent frequency
> looks like 0?

The problem appeared when suspending the rcar-du driver.
The kernel tested is a Renesas BSP release (3.6.2), and in the
version of the rcar-du driver from that release, the driver calls
clk_set_rate() with a rate of zero in its suspend PM op. This is
fixed in mainline kernel. So the divide-by-zero in vc5 clock driver
probably will not show up in mainline.

>   Should this get a Fixes: tag so that it goes back to
> stable kernels?
>

Zero rates are not checked beginning with the initial commit
3e1aec4e2c ("clk: vc5: Add support for IDT VersaClock 5P49V5923 and 
5P49V5933").
so that would have to be the Fixes: tag.

Steve

Re: [PATCH] clk: vc5: Avoid divide by zero when rounding or setting rates

[Stephen Boyd]

Quoting Steve Longerbeam (2018-07-18 10:56:51)
> 
> 
> On 07/06/2018 11:23 AM, Stephen Boyd wrote:
> > Quoting Steve Longerbeam (2018-05-31 18:59:17)
> >> Add checks in the .round_rate and .set_rate ops for zero requested
> >> rate or zero parent rate. If either are zero in .round_rate, just
> >> return zero. If either are zero in .set_rate, return -EINVAL.
> > Are you seeing problems when the clk is unparented and we're trying to
> > recalculate the rate or change rates, and thus the parent frequency
> > looks like 0?
> 
> The problem appeared when suspending the rcar-du driver.
> The kernel tested is a Renesas BSP release (3.6.2), and in the
> version of the rcar-du driver from that release, the driver calls
> clk_set_rate() with a rate of zero in its suspend PM op. This is
> fixed in mainline kernel. So the divide-by-zero in vc5 clock driver
> probably will not show up in mainline.

Ok so then this patch shouldn't be applied on mainline?

> 
> >   Should this get a Fixes: tag so that it goes back to
> > stable kernels?
> >
> 
> Zero rates are not checked beginning with the initial commit
> 3e1aec4e2c ("clk: vc5: Add support for IDT VersaClock 5P49V5923 and 
> 5P49V5933").
> so that would have to be the Fixes: tag.

Thanks!

Re: [PATCH] clk: vc5: Avoid divide by zero when rounding or setting rates

[Stephen Boyd]

Quoting Steve Longerbeam (2018-07-18 10:56:51)
> =

> =

> On 07/06/2018 11:23 AM, Stephen Boyd wrote:
> > Quoting Steve Longerbeam (2018-05-31 18:59:17)
> >> Add checks in the .round_rate and .set_rate ops for zero requested
> >> rate or zero parent rate. If either are zero in .round_rate, just
> >> return zero. If either are zero in .set_rate, return -EINVAL.
> > Are you seeing problems when the clk is unparented and we're trying to
> > recalculate the rate or change rates, and thus the parent frequency
> > looks like 0?
> =

> The problem appeared when suspending the rcar-du driver.
> The kernel tested is a Renesas BSP release (3.6.2), and in the
> version of the rcar-du driver from that release, the driver calls
> clk_set_rate() with a rate of zero in its suspend PM op. This is
> fixed in mainline kernel. So the divide-by-zero in vc5 clock driver
> probably will not show up in mainline.

Ok so then this patch shouldn't be applied on mainline?

> =

> >   Should this get a Fixes: tag so that it goes back to
> > stable kernels?
> >
> =

> Zero rates are not checked beginning with the initial commit
> 3e1aec4e2c ("clk: vc5: Add support for IDT VersaClock 5P49V5923 and =

> 5P49V5933").
> so that would have to be the Fixes: tag.

Thanks!