devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
To: Michael Turquette
	<mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>,
	Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
	Maxime Ripard
	<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: dev-3kdeTeqwOZ9EV1b7eY7vFQ@public.gmane.org,
	Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
	linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH resend 1/9] clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock
Date: Tue, 26 Jul 2016 15:04:23 +0800	[thread overview]
Message-ID: <1469516671-19377-2-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1469516671-19377-1-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>

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-jdAy2FN1RRM@public.gmane.org>
Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2016-07-26  7:04 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-26  7:04 [PATCH 0/9] clk: sunxi-ng: Support A31/A31s CCU Chen-Yu Tsai
2016-07-26  7:04 ` [PATCH 3/9] clk: sunxi-ng: mux: Increase fixed pre-divider div size Chen-Yu Tsai
     [not found]   ` <1469516671-19377-4-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-27  6:43     ` Maxime Ripard
2016-07-26  7:04 ` [PATCH 4/9] clk: sunxi-ng: mux: Add support for mux tables Chen-Yu Tsai
2016-07-26 17:43   ` Jean-Francois Moine
2016-07-27  6:59     ` Maxime Ripard
2016-07-27  7:18       ` Jean-Francois Moine
2016-07-27  7:30         ` Chen-Yu Tsai
     [not found]         ` <20160727091827.e26f72701ce5758fa29aff7a-GANU6spQydw@public.gmane.org>
2016-07-27  7:40           ` Maxime Ripard
2016-07-27  8:36             ` Jean-Francois Moine
     [not found]               ` <20160727103649.9e6ef332847b5a5c8fac66af-GANU6spQydw@public.gmane.org>
2016-07-28 13:28                 ` Maxime Ripard
2016-07-28 14:23                   ` Jean-Francois Moine
     [not found]   ` <1469516671-19377-5-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-27  6:48     ` Maxime Ripard
     [not found] ` <1469516671-19377-1-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-26  7:04   ` Chen-Yu Tsai [this message]
     [not found]     ` <1469516671-19377-2-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-26  8:56       ` [PATCH resend 1/9] clk: sunxi-ng: Fix inverted test condition in ccu_helper_wait_for_lock Maxime Ripard
2016-07-26  7:04   ` [PATCH 2/9] clk: sunxi-ng: nk: Make ccu_nk_find_best static Chen-Yu Tsai
     [not found]     ` <1469516671-19377-3-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-26  8:57       ` Maxime Ripard
2016-07-26  7:04   ` [PATCH 5/9] clk: sunxi-ng: mux: support fixed pre-dividers on multiple parents Chen-Yu Tsai
     [not found]     ` <1469516671-19377-6-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-27  7:26       ` Maxime Ripard
2016-07-27  8:38     ` Jean-Francois Moine
2016-07-26  7:04   ` [PATCH 6/9] clk: sunxi-ng: nkm: Add mux to support " Chen-Yu Tsai
     [not found]     ` <1469516671-19377-7-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-27  7:27       ` Maxime Ripard
2016-07-26  7:04   ` [PATCH 7/9] clk: sunxi-ng: mux: Add clk notifier functions Chen-Yu Tsai
     [not found]     ` <1469516671-19377-8-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-27  7:30       ` Maxime Ripard
2016-07-27  7:32         ` Chen-Yu Tsai
     [not found]           ` <CAGb2v67KcvzxadXYTWSg42+gpRxt4fhNmiWmtAD5D7r0+K4T8g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-07-27  7:43             ` Maxime Ripard
2016-07-26  7:04   ` [PATCH 8/9] clk: sunxi-ng: Add A31/A31s clocks Chen-Yu Tsai
2016-07-26  8:30     ` Jean-Francois Moine
2016-07-27 14:59     ` Rob Herring
     [not found]     ` <1469516671-19377-9-git-send-email-wens-jdAy2FN1RRM@public.gmane.org>
2016-07-28 13:31       ` Maxime Ripard
2016-07-26  7:04   ` [PATCH 9/9] ARM: dts: sun6i: switch A31/A31s to new CCU clock bindings Chen-Yu Tsai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1469516671-19377-2-git-send-email-wens@csie.org \
    --to=wens-jday2fn1rrm@public.gmane.org \
    --cc=dev-3kdeTeqwOZ9EV1b7eY7vFQ@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).