From: Michael Turquette <mturquette@baylibre.com>
To: linux-clk@vger.kernel.org
Cc: lee.jones@linaro.org, sboyd@codeaurora.org,
maxime.ripard@free-electrons.com, maxime.coquelin@st.com,
geert@linux-m68k.org, heiko@sntech.de, andre.przywara@arm.com,
rklein@nvidia.com, linux-kernel@vger.kernel.org,
Michael Turquette <mturquette@baylibre.com>
Subject: [PATCH v42 2/6] clk: WARN_ON about to disable a critical clock
Date: Thu, 11 Feb 2016 13:19:10 -0800 [thread overview]
Message-ID: <1455225554-13267-3-git-send-email-mturquette@baylibre.com> (raw)
In-Reply-To: <1455225554-13267-1-git-send-email-mturquette@baylibre.com>
From: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
---
drivers/clk/clk.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 993f775..39f9527 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -575,6 +575,9 @@ static void clk_core_unprepare(struct clk_core *core)
if (WARN_ON(core->prepare_count == 0))
return;
+ if (WARN_ON(core->prepare_count == 1 && core->flags & CLK_IS_CRITICAL))
+ return;
+
if (--core->prepare_count > 0)
return;
@@ -680,6 +683,9 @@ static void clk_core_disable(struct clk_core *core)
if (WARN_ON(core->enable_count == 0))
return;
+ if (WARN_ON(core->enable_count == 1 && core->flags & CLK_IS_CRITICAL))
+ return;
+
if (--core->enable_count > 0)
return;
--
2.1.4
next prev parent reply other threads:[~2016-02-11 21:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 21:19 [PATCH v42 0/6] critical clocks and handoff clocks Michael Turquette
2016-02-11 21:19 ` [PATCH v42 1/6] clk: Allow clocks to be marked as CRITICAL Michael Turquette
2016-02-12 8:03 ` Lee Jones
2016-02-13 1:14 ` Stephen Boyd
[not found] ` <20160215202734.2278.91610@quark.deferred.io>
2016-02-19 2:03 ` Stephen Boyd
2016-02-11 21:19 ` Michael Turquette [this message]
2016-02-13 1:14 ` [PATCH v42 2/6] clk: WARN_ON about to disable a critical clock Stephen Boyd
2016-02-11 21:19 ` [PATCH v42 3/6] clk: Provide OF helper to mark clocks as CRITICAL Michael Turquette
2016-02-12 8:02 ` Lee Jones
[not found] ` <20160330171542.23150.23031@quark.deferred.io>
2016-03-31 9:14 ` Lee Jones
2016-02-13 1:09 ` Stephen Boyd
2016-02-11 21:19 ` [PATCH v42 4/6] clk: per-user clk prepare & enable ref counts Michael Turquette
2016-02-13 1:16 ` Stephen Boyd
2016-02-11 21:19 ` [PATCH v42 5/6] clk: clk_put WARNs if user has not disabled clk Michael Turquette
2016-02-13 1:18 ` Stephen Boyd
2016-02-14 14:51 ` Geert Uytterhoeven
2016-02-11 21:19 ` [PATCH v42 6/6] clk: introduce CLK_ENABLE_HAND_OFF flag Michael Turquette
2016-02-12 8:06 ` [PATCH v42 0/6] critical clocks and handoff clocks Lee Jones
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=1455225554-13267-3-git-send-email-mturquette@baylibre.com \
--to=mturquette@baylibre.com \
--cc=andre.przywara@arm.com \
--cc=geert@linux-m68k.org \
--cc=heiko@sntech.de \
--cc=lee.jones@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.coquelin@st.com \
--cc=maxime.ripard@free-electrons.com \
--cc=rklein@nvidia.com \
--cc=sboyd@codeaurora.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
all inboxes | Powered by JetHome®