clk: divider: fix incorrect usage of container_of
divider_recalc_rate() is an helper function used by clock divider of
different types, so the structure containing the 'hw' pointer is not
always a 'struct clk_divider'
At the following line:
> div = _get_div(table, val, flags, divider->width);
in several cases, the value of 'divider->width' is garbage as the actual
structure behind this memory is not a 'struct clk_divider'
Fortunately, this width value is used by _get_val() only when
CLK_DIVIDER_MAX_AT_ZERO flag is set. This has never been the case so
far when the structure is not a 'struct clk_divider'. This is probably
why we did not notice this bug before
Fixes: afe76c8fd0
("clk: allow a clk divider with max divisor when zero")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Sylvain Lemieux <slemieux.tyco@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
4fbd8d194f
commit
12a26c298d
@ -118,12 +118,11 @@ static unsigned int _get_val(const struct clk_div_table *table,
|
|||||||
unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate,
|
unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate,
|
||||||
unsigned int val,
|
unsigned int val,
|
||||||
const struct clk_div_table *table,
|
const struct clk_div_table *table,
|
||||||
unsigned long flags)
|
unsigned long flags, unsigned long width)
|
||||||
{
|
{
|
||||||
struct clk_divider *divider = to_clk_divider(hw);
|
|
||||||
unsigned int div;
|
unsigned int div;
|
||||||
|
|
||||||
div = _get_div(table, val, flags, divider->width);
|
div = _get_div(table, val, flags, width);
|
||||||
if (!div) {
|
if (!div) {
|
||||||
WARN(!(flags & CLK_DIVIDER_ALLOW_ZERO),
|
WARN(!(flags & CLK_DIVIDER_ALLOW_ZERO),
|
||||||
"%s: Zero divisor and CLK_DIVIDER_ALLOW_ZERO not set\n",
|
"%s: Zero divisor and CLK_DIVIDER_ALLOW_ZERO not set\n",
|
||||||
@ -145,7 +144,7 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw *hw,
|
|||||||
val &= div_mask(divider->width);
|
val &= div_mask(divider->width);
|
||||||
|
|
||||||
return divider_recalc_rate(hw, parent_rate, val, divider->table,
|
return divider_recalc_rate(hw, parent_rate, val, divider->table,
|
||||||
divider->flags);
|
divider->flags, divider->width);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool _is_valid_table_div(const struct clk_div_table *table,
|
static bool _is_valid_table_div(const struct clk_div_table *table,
|
||||||
|
@ -56,7 +56,7 @@ static unsigned long hi6220_clkdiv_recalc_rate(struct clk_hw *hw,
|
|||||||
val &= div_mask(dclk->width);
|
val &= div_mask(dclk->width);
|
||||||
|
|
||||||
return divider_recalc_rate(hw, parent_rate, val, dclk->table,
|
return divider_recalc_rate(hw, parent_rate, val, dclk->table,
|
||||||
CLK_DIVIDER_ROUND_CLOSEST);
|
CLK_DIVIDER_ROUND_CLOSEST, dclk->width);
|
||||||
}
|
}
|
||||||
|
|
||||||
static long hi6220_clkdiv_round_rate(struct clk_hw *hw, unsigned long rate,
|
static long hi6220_clkdiv_round_rate(struct clk_hw *hw, unsigned long rate,
|
||||||
|
@ -956,7 +956,7 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw *hw,
|
|||||||
val &= div_mask(divider->width);
|
val &= div_mask(divider->width);
|
||||||
|
|
||||||
return divider_recalc_rate(hw, parent_rate, val, divider->table,
|
return divider_recalc_rate(hw, parent_rate, val, divider->table,
|
||||||
divider->flags);
|
divider->flags, divider->width);
|
||||||
}
|
}
|
||||||
|
|
||||||
static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
|
static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
|
||||||
|
@ -59,7 +59,7 @@ static unsigned long div_recalc_rate(struct clk_hw *hw,
|
|||||||
div &= BIT(divider->width) - 1;
|
div &= BIT(divider->width) - 1;
|
||||||
|
|
||||||
return divider_recalc_rate(hw, parent_rate, div, NULL,
|
return divider_recalc_rate(hw, parent_rate, div, NULL,
|
||||||
CLK_DIVIDER_ROUND_CLOSEST);
|
CLK_DIVIDER_ROUND_CLOSEST, divider->width);
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct clk_ops clk_regmap_div_ops = {
|
const struct clk_ops clk_regmap_div_ops = {
|
||||||
|
@ -71,7 +71,7 @@ static unsigned long ccu_div_recalc_rate(struct clk_hw *hw,
|
|||||||
parent_rate);
|
parent_rate);
|
||||||
|
|
||||||
val = divider_recalc_rate(hw, parent_rate, val, cd->div.table,
|
val = divider_recalc_rate(hw, parent_rate, val, cd->div.table,
|
||||||
cd->div.flags);
|
cd->div.flags, cd->div.width);
|
||||||
|
|
||||||
if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||||
val /= cd->fixed_post_div;
|
val /= cd->fixed_post_div;
|
||||||
|
@ -698,7 +698,7 @@ static unsigned long dsi_pll_14nm_postdiv_recalc_rate(struct clk_hw *hw,
|
|||||||
val &= div_mask(width);
|
val &= div_mask(width);
|
||||||
|
|
||||||
return divider_recalc_rate(hw, parent_rate, val, NULL,
|
return divider_recalc_rate(hw, parent_rate, val, NULL,
|
||||||
postdiv->flags);
|
postdiv->flags, width);
|
||||||
}
|
}
|
||||||
|
|
||||||
static long dsi_pll_14nm_postdiv_round_rate(struct clk_hw *hw,
|
static long dsi_pll_14nm_postdiv_round_rate(struct clk_hw *hw,
|
||||||
|
@ -137,13 +137,15 @@ static unsigned long ac100_clkout_recalc_rate(struct clk_hw *hw,
|
|||||||
div = (reg >> AC100_CLKOUT_PRE_DIV_SHIFT) &
|
div = (reg >> AC100_CLKOUT_PRE_DIV_SHIFT) &
|
||||||
((1 << AC100_CLKOUT_PRE_DIV_WIDTH) - 1);
|
((1 << AC100_CLKOUT_PRE_DIV_WIDTH) - 1);
|
||||||
prate = divider_recalc_rate(hw, prate, div,
|
prate = divider_recalc_rate(hw, prate, div,
|
||||||
ac100_clkout_prediv, 0);
|
ac100_clkout_prediv, 0,
|
||||||
|
AC100_CLKOUT_PRE_DIV_WIDTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
div = (reg >> AC100_CLKOUT_DIV_SHIFT) &
|
div = (reg >> AC100_CLKOUT_DIV_SHIFT) &
|
||||||
(BIT(AC100_CLKOUT_DIV_WIDTH) - 1);
|
(BIT(AC100_CLKOUT_DIV_WIDTH) - 1);
|
||||||
return divider_recalc_rate(hw, prate, div, NULL,
|
return divider_recalc_rate(hw, prate, div, NULL,
|
||||||
CLK_DIVIDER_POWER_OF_TWO);
|
CLK_DIVIDER_POWER_OF_TWO,
|
||||||
|
AC100_CLKOUT_DIV_WIDTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
static long ac100_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
|
static long ac100_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
|
||||||
|
@ -412,7 +412,7 @@ extern const struct clk_ops clk_divider_ro_ops;
|
|||||||
|
|
||||||
unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate,
|
unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate,
|
||||||
unsigned int val, const struct clk_div_table *table,
|
unsigned int val, const struct clk_div_table *table,
|
||||||
unsigned long flags);
|
unsigned long flags, unsigned long width);
|
||||||
long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
|
long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
|
||||||
unsigned long rate, unsigned long *prate,
|
unsigned long rate, unsigned long *prate,
|
||||||
const struct clk_div_table *table,
|
const struct clk_div_table *table,
|
||||||
|
Loading…
Reference in New Issue
Block a user