clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock
Subsystems (2)
PATCH 1/1 clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock
The condition passed to read*_poll_timeout() is the break condition, i.e. wait for this condition to happen and return success.
The original code assumed the opposite, resulting in a warning when the PLL clock rate was changed but never lost it's lock as far as the readout indicated. This was verified by checking the read out register value.
--- drivers/clk/sunxi-ng/ccu_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu_common.c +1 -1
@@ -31,7 +31,7 @@ void ccu_helper_wait_for_lock(struct ccu_common *common, u32 lock)return ;WARN_ON (readl_relaxed_poll_timeout (common->base + common->reg, reg, - !(reg & lock),100 ,70000 )); + reg & lock,100 ,70000 )); } int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,
Signature · 1 line
2.8.1
PATCH 1/1 clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock
Quoted 10 lines · Chen-Yu Tsai
The condition passed to read*_poll_timeout() is the break condition, i.e. wait for this condition to happen and return success.
The original code assumed the opposite, resulting in a warning when the PLL clock rate was changed but never lost it's lock as far as the readout indicated. This was verified by checking the read out register value.
Fixes 1d80c14248d6 ("clk: sunxi-ng: Add common infrastructure")Signed-off-by Chen-Yu Tsai <[email protected]>
Mike, Stephen, could you add that patch on top of the current branch?
Thanks,
Maxime
Signature · 10 lines
Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160715/28fbf36e/attachment-0001.sig>
Stephen Boyd
AppliedPATCH 1/1 clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock
Quoted 9 lines · Maxime Ripard
Quoted 8 lines · Chen-Yu Tsai
The condition passed to read*_poll_timeout() is the break condition, i.e. wait for this condition to happen and return success.
The original code assumed the opposite, resulting in a warning when the PLL clock rate was changed but never lost it's lock as far as the readout indicated. This was verified by checking the read out register value.
Quoted 7 lines
Quoted 2 lines
Fixes 1d80c14248d6 ("clk: sunxi-ng: Add common infrastructure")Signed-off-by Chen-Yu Tsai <[email protected]>Acked-by Maxime Ripard <[email protected]>Mike, Stephen, could you add that patch on top of the current branch?
Applied to clk-fixes
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project