From: Michael Turquette <mturquette@baylibre.com>
To: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org
Cc: sboyd@codeaurora.org, lee.jones@linaro.org,
maxime.ripard@free-electrons.com, s.hauer@pengutronix.de,
geert@linux-m68k.org, Michael Turquette <mturquette@baylibre.com>
Subject: [PATCH RFC RFT 1/3] clk: per-user clk prepare & enable ref counts
Date: Fri, 7 Aug 2015 12:09:28 -0700 [thread overview]
Message-ID: <1438974570-20812-2-git-send-email-mturquette@baylibre.com> (raw)
In-Reply-To: <1438974570-20812-1-git-send-email-mturquette@baylibre.com>
This patch adds prepare and enable reference counts for the per-user
handles that clock consumers have for a clock node. This patch warns if
an imbalance occurs while trying to disable or unprepare a clock and
aborts, leaving the hardware unaffected.
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
---
drivers/clk/clk.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 898052e..72feee9 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -84,6 +84,8 @@ struct clk {
unsigned long min_rate;
unsigned long max_rate;
struct hlist_node clks_node;
+ unsigned int enable_count;
+ unsigned int prepare_count;
};
/*** locking ***/
@@ -600,6 +602,9 @@ void clk_unprepare(struct clk *clk)
return;
clk_prepare_lock();
+ if (WARN_ON(clk->prepare_count == 0))
+ return;
+ clk->prepare_count--;
clk_core_unprepare(clk->core);
clk_prepare_unlock();
}
@@ -657,6 +662,7 @@ int clk_prepare(struct clk *clk)
return 0;
clk_prepare_lock();
+ clk->prepare_count++;
ret = clk_core_prepare(clk->core);
clk_prepare_unlock();
@@ -707,6 +713,9 @@ void clk_disable(struct clk *clk)
return;
flags = clk_enable_lock();
+ if (WARN_ON(clk->enable_count == 0))
+ return;
+ clk->enable_count--;
clk_core_disable(clk->core);
clk_enable_unlock(flags);
}
@@ -769,6 +778,7 @@ int clk_enable(struct clk *clk)
return 0;
flags = clk_enable_lock();
+ clk->enable_count++;
ret = clk_core_enable(clk->core);
clk_enable_unlock(flags);
--
1.9.1
next prev parent reply other threads:[~2015-08-07 19:13 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-07 19:09 [PATCH RFC RFT 0/3] clk: detect per-user enable imbalances and implement hand-off Michael Turquette
2015-08-07 19:09 ` Michael Turquette [this message]
2015-08-10 13:47 ` [PATCH RFC RFT 1/3] clk: per-user clk prepare & enable ref counts Maxime Coquelin
2015-08-10 19:31 ` Michael Turquette
2015-08-07 19:09 ` [PATCH RFC RFT 2/3] clk: clk_put WARNs if user has not disabled clk Michael Turquette
2015-09-30 15:38 ` Geert Uytterhoeven
[not found] ` <20151020124000.20687.60752@quantum>
2015-10-20 12:52 ` Russell King - ARM Linux
2015-10-21 9:50 ` Geert Uytterhoeven
2015-10-21 10:59 ` Russell King - ARM Linux
2015-10-21 15:50 ` Michael Turquette
2015-10-21 16:46 ` Geert Uytterhoeven
2015-08-07 19:09 ` [PATCH RFC RFT 3/3] clk: introduce CLK_ENABLE_HAND_OFF flag Michael Turquette
2015-08-10 14:48 ` Lee Jones
[not found] ` <20150810185516.2416.32293@quantum>
2015-08-11 8:43 ` Lee Jones
2015-08-11 10:02 ` Maxime Coquelin
2015-08-11 10:11 ` Geert Uytterhoeven
2015-08-11 11:36 ` Maxime Coquelin
2015-08-11 11:41 ` Maxime Coquelin
2015-08-11 11:49 ` Geert Uytterhoeven
2015-08-11 12:03 ` Maxime Coquelin
2015-08-11 12:34 ` Geert Uytterhoeven
2015-08-11 12:03 ` Lee Jones
2015-08-11 17:09 ` Michael Turquette
2015-08-11 18:17 ` Lee Jones
2015-08-12 7:27 ` Geert Uytterhoeven
2015-08-12 7:51 ` Lee Jones
2015-08-11 17:09 ` Michael Turquette
2015-08-11 18:20 ` Lee Jones
[not found] ` <20150811170904.2416.43354@quantum>
2015-08-11 18:33 ` Lee Jones
[not found] ` <20150811185827.31346.68194@quantum>
2015-08-18 15:52 ` Maxime Ripard
[not found] ` <20150818163356.31346.15075@quantum>
2015-08-20 15:11 ` Maxime Ripard
2015-08-18 15:58 ` Maxime Ripard
[not found] ` <20150818163931.31346.78267@quantum>
2015-08-20 15:39 ` Maxime Ripard
2015-08-10 15:36 ` [PATCH RFC RFT 0/3] clk: detect per-user enable imbalances and implement hand-off Lee Jones
[not found] ` <20150810192810.2416.25672@quantum>
2015-08-11 9:11 ` Lee Jones
2015-08-11 9:20 ` Geert Uytterhoeven
[not found] ` <20150811164151.2416.33353@quantum>
2015-08-11 17:42 ` Geert Uytterhoeven
2015-08-18 15:45 ` Maxime Ripard
[not found] ` <20150818164356.31346.80341@quantum>
2015-08-20 15:15 ` Maxime Ripard
[not found] ` <20150825215051.31346.56261@quantum>
2015-08-26 6:54 ` Lee Jones
2015-08-26 8:42 ` Maxime Coquelin
2015-08-26 9:09 ` Lee Jones
2015-08-26 9:37 ` Maxime Coquelin
2015-08-26 20:41 ` Lee Jones
2015-08-29 3:49 ` Maxime Ripard
2015-08-29 3:55 ` Maxime Ripard
[not found] ` <20150930123649.3201.75689@quantum>
2015-10-01 19:56 ` Maxime Ripard
2015-11-24 9:48 ` Heiko Stübner
2015-12-05 0:46 ` Michael Turquette
2016-02-11 21:33 ` Michael Turquette
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=1438974570-20812-2-git-send-email-mturquette@baylibre.com \
--to=mturquette@baylibre.com \
--cc=geert@linux-m68k.org \
--cc=lee.jones@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=s.hauer@pengutronix.de \
--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;
as well as URLs for NNTP newsgroup(s).