| Message ID | 20190916154546.24982-2-manivannan.sadhasivam@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add SD/MMC driver for Actions Semi S900 SoC | expand |
Quoting Manivannan Sadhasivam (2019-09-16 08:45:40) > Since the helper "owl_factor_helper_round_rate" is shared between factor > and composite clocks, using the factor clk specific helper function > like "hw_to_owl_factor" to access its members will create issues when > called from composite clk specific code. Hence, pass the "factor_hw" > struct pointer directly instead of fetching it using factor clk specific > helpers. > > This issue has been observed when a composite clock like "sd0_clk" tried > to call "owl_factor_helper_round_rate" resulting in pointer dereferencing > error. > > While we are at it, let's rename the "clk_val_best" function to > "owl_clk_val_best" since this is an owl SoCs specific helper. > > Fixes: 4bb78fc9744a ("clk: actions: Add factor clock support") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Reviewed-by: Stephen Boyd <sboyd@kernel.org> > --- I can apply this to clk-next?
On Tue, Sep 17, 2019 at 09:34:18AM -0700, Stephen Boyd wrote: > Quoting Manivannan Sadhasivam (2019-09-16 08:45:40) > > Since the helper "owl_factor_helper_round_rate" is shared between factor > > and composite clocks, using the factor clk specific helper function > > like "hw_to_owl_factor" to access its members will create issues when > > called from composite clk specific code. Hence, pass the "factor_hw" > > struct pointer directly instead of fetching it using factor clk specific > > helpers. > > > > This issue has been observed when a composite clock like "sd0_clk" tried > > to call "owl_factor_helper_round_rate" resulting in pointer dereferencing > > error. > > > > While we are at it, let's rename the "clk_val_best" function to > > "owl_clk_val_best" since this is an owl SoCs specific helper. > > > > Fixes: 4bb78fc9744a ("clk: actions: Add factor clock support") > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > Reviewed-by: Stephen Boyd <sboyd@kernel.org> > > --- > > I can apply this to clk-next? Yes, please :-) Rest can go through Ulf's tree. Thanks, Mani >
Quoting Manivannan Sadhasivam (2019-09-16 08:45:40) > Since the helper "owl_factor_helper_round_rate" is shared between factor > and composite clocks, using the factor clk specific helper function > like "hw_to_owl_factor" to access its members will create issues when > called from composite clk specific code. Hence, pass the "factor_hw" > struct pointer directly instead of fetching it using factor clk specific > helpers. > > This issue has been observed when a composite clock like "sd0_clk" tried > to call "owl_factor_helper_round_rate" resulting in pointer dereferencing > error. > > While we are at it, let's rename the "clk_val_best" function to > "owl_clk_val_best" since this is an owl SoCs specific helper. > > Fixes: 4bb78fc9744a ("clk: actions: Add factor clock support") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Reviewed-by: Stephen Boyd <sboyd@kernel.org> > --- Applied to clk-next
diff --git a/drivers/clk/actions/owl-factor.c b/drivers/clk/actions/owl-factor.c index 317d4a9e112e..f15e2621fa18 100644 --- a/drivers/clk/actions/owl-factor.c +++ b/drivers/clk/actions/owl-factor.c @@ -64,11 +64,10 @@ static unsigned int _get_table_val(const struct clk_factor_table *table, return val; } -static int clk_val_best(struct clk_hw *hw, unsigned long rate, +static int owl_clk_val_best(const struct owl_factor_hw *factor_hw, + struct clk_hw *hw, unsigned long rate, unsigned long *best_parent_rate) { - struct owl_factor *factor = hw_to_owl_factor(hw); - struct owl_factor_hw *factor_hw = &factor->factor_hw; const struct clk_factor_table *clkt = factor_hw->table; unsigned long parent_rate, try_parent_rate, best = 0, cur_rate; unsigned long parent_rate_saved = *best_parent_rate; @@ -126,7 +125,7 @@ long owl_factor_helper_round_rate(struct owl_clk_common *common, const struct clk_factor_table *clkt = factor_hw->table; unsigned int val, mul = 0, div = 1; - val = clk_val_best(&common->hw, rate, parent_rate); + val = owl_clk_val_best(factor_hw, &common->hw, rate, parent_rate); _get_table_div_mul(clkt, val, &mul, &div); return *parent_rate * mul / div;
Since the helper "owl_factor_helper_round_rate" is shared between factor and composite clocks, using the factor clk specific helper function like "hw_to_owl_factor" to access its members will create issues when called from composite clk specific code. Hence, pass the "factor_hw" struct pointer directly instead of fetching it using factor clk specific helpers. This issue has been observed when a composite clock like "sd0_clk" tried to call "owl_factor_helper_round_rate" resulting in pointer dereferencing error. While we are at it, let's rename the "clk_val_best" function to "owl_clk_val_best" since this is an owl SoCs specific helper. Fixes: 4bb78fc9744a ("clk: actions: Add factor clock support") Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Stephen Boyd <sboyd@kernel.org> --- drivers/clk/actions/owl-factor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)