clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq()
Subsystems (3)
Stephen Boyd
maintainerPATCH 1/1 clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq()
The DFS frequency table logic overwrites 'cfg' while detecting the parent clk and then later on in clk_rcg2_dfs_populate_freq() we use that same variable to figure out the mode of the clk, either MND or not. Add a new variable to hold the parent clk bit so that 'cfg' is left untouched for use later.
This fixes problems in detecting the supported frequencies for any clks in DFS mode.
--- drivers/clk/qcom/clk-rcg2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/qcom/clk-rcg2.c +4 -4
@@ -953,7 +953,7 @@ static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,struct clk_rcg2 *rcg =to_clk_rcg2 (hw);struct clk_hw *p;unsigned long prate =0 ; -u32 val, mask, cfg, mode; +u32 val, mask, cfg, mode, src;int i, num_parents;regmap_read (rcg->clkr.regmap, rcg->cmd_rcgr +SE_PERF_DFSR (l), &cfg);
@@ -963,12 +963,12 @@ static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,if (cfg & mask) f->pre_div = cfg & mask; - cfg &=CFG_SRC_SEL_MASK ; - cfg >>=CFG_SRC_SEL_SHIFT ; + src = cfg &CFG_SRC_SEL_MASK ; + src >>=CFG_SRC_SEL_SHIFT ; num_parents =clk_hw_get_num_parents (hw);for (i =0 ; i < num_parents; i++) { -if (cfg == rcg->parent_map[i].cfg) { +if (src == rcg->parent_map[i].cfg) { f->src = rcg->parent_map[i].src; p =clk_hw_get_parent_by_index (&rcg->clkr.hw, i); prate =clk_hw_get_rate (p);
Signature · 1 line
Sent by a computer, using git, on the internet
Quoted 6 lines · Stephen Boyd
The DFS frequency table logic overwrites 'cfg' while detecting the parent clk and then later on in
clk_rcg2_dfs_populate_freq()we use that same variable to figure out the mode of the clk, either MND or not. Add a new variable to hold the parent clk bit so that 'cfg' is left untouched for use later.
Quoted 7 lines
This fixes problems in detecting the supported frequencies for any clks in DFS mode.
Fixes cc4f6944d0e3 ("clk: qcom: Add support for RCG to register for DFS")Reported-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Quoted 33 lines
drivers/clk/qcom/clk-rcg2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/clk/qcom/clk-rcg2.c +4
-4@@ -953,7 +953,7 @@ static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,struct clk_rcg2 *rcg =to_clk_rcg2 (hw);struct clk_hw *p;unsigned long prate =0 ; -u32 val, mask, cfg, mode; +u32 val, mask, cfg, mode, src;int i, num_parents;regmap_read (rcg->clkr.regmap, rcg->cmd_rcgr +SE_PERF_DFSR (l), &cfg);@@ -963,12 +963,12 @@ static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,if (cfg & mask) f->pre_div = cfg & mask; - cfg &=CFG_SRC_SEL_MASK ; - cfg >>=CFG_SRC_SEL_SHIFT ; + src = cfg &CFG_SRC_SEL_MASK ; + src >>=CFG_SRC_SEL_SHIFT ; num_parents =clk_hw_get_num_parents (hw);for (i =0 ; i < num_parents; i++) { -if (cfg == rcg->parent_map[i].cfg) { +if (src == rcg->parent_map[i].cfg) { f->src = rcg->parent_map[i].src; p =clk_hw_get_parent_by_index (&rcg->clkr.hw, i); prate =clk_hw_get_rate (p);
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoting Stephen Boyd (2020-01-28 11:33:29)
Quoted 6 lines
The DFS frequency table logic overwrites 'cfg' while detecting the parent clk and then later on in
clk_rcg2_dfs_populate_freq()we use that same variable to figure out the mode of the clk, either MND or not. Add a new variable to hold the parent clk bit so that 'cfg' is left untouched for use later.
Quoted 7 lines
This fixes problems in detecting the supported frequencies for any clks in DFS mode.
Fixes cc4f6944d0e3 ("clk: qcom: Add support for RCG to register for DFS")Reported-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next