Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1450430

[PATCH resend 1/9] clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock

Show all headers | View raw

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 <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/clk/sunxi-ng/ccu_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c
index fc17b5295e16..51d4bac97ab3 100644
--- a/drivers/clk/sunxi-ng/ccu_common.c
+++ b/drivers/clk/sunxi-ng/ccu_common.c
@@ -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,
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] clk: sunxi-ng: Support A31/A31s CCU Chen-Yu Tsai <wens@csie.org> - 2016-07-26 09:10 +0200
  [PATCH 2/9] clk: sunxi-ng: nk: Make ccu_nk_find_best static Chen-Yu Tsai <wens@csie.org> - 2016-07-26 09:10 +0200
    Re: [PATCH 2/9] clk: sunxi-ng: nk: Make ccu_nk_find_best static Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-26 11:00 +0200
  [PATCH 7/9] clk: sunxi-ng: mux: Add clk notifier functions Chen-Yu Tsai <wens@csie.org> - 2016-07-26 09:10 +0200
    Re: [PATCH 7/9] clk: sunxi-ng: mux: Add clk notifier functions Chen-Yu Tsai <wens@csie.org> - 2016-07-27 09:40 +0200
      Re: [PATCH 7/9] clk: sunxi-ng: mux: Add clk notifier functions Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-27 09:50 +0200
    Re: [PATCH 7/9] clk: sunxi-ng: mux: Add clk notifier functions Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-27 09:40 +0200
  [PATCH resend 1/9] clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock Chen-Yu Tsai <wens@csie.org> - 2016-07-26 09:10 +0200
    Re: [PATCH resend 1/9] clk: sunxi-ng: Fix inverted test condition in  ccu_helper_wait_for_lock Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-26 11:00 +0200
  [PATCH 9/9] ARM: dts: sun6i: switch A31/A31s to new CCU clock bindings Chen-Yu Tsai <wens@csie.org> - 2016-07-26 09:10 +0200
  [PATCH 3/9] clk: sunxi-ng: mux: Increase fixed pre-divider div size Chen-Yu Tsai <wens@csie.org> - 2016-07-26 09:10 +0200
    Re: [PATCH 3/9] clk: sunxi-ng: mux: Increase fixed pre-divider div  size Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-27 08:50 +0200
  Re: [PATCH 8/9] clk: sunxi-ng: Add A31/A31s clocks Jean-Francois Moine <moinejf@free.fr> - 2016-07-26 10:40 +0200
  Re: [PATCH 8/9] clk: sunxi-ng: Add A31/A31s clocks Rob Herring <robh@kernel.org> - 2016-07-27 17:00 +0200
  Re: [PATCH 8/9] clk: sunxi-ng: Add A31/A31s clocks Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-28 15:40 +0200

csiph-web