[RFC PATCH V1 2/2] clk: add lock for clk_core_is_enabled

Dong Aisheng aisheng.dong at nxp.com
Fri Dec 22 01:46:05 PST 2017


According to design doc, .is_enabled should be protected by enable lock.
Then users don't have to protect it against enable/disable operation
in clock drivers.

See: Documentation/clk.txt
"The enable lock is a spinlock and is held across calls to the .enable,
.disable and .is_enabled operations."

Cc: Stephen Boyd <sboyd at codeaurora.org>
Cc: Michael Turquette <mturquette at baylibre.com>
Signed-off-by: Dong Aisheng <aisheng.dong at nxp.com>
---
 drivers/clk/clk.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index e24968f..d6e2d5c 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -198,14 +198,19 @@ static bool clk_core_is_prepared(struct clk_core *core)
 
 static bool clk_core_is_enabled(struct clk_core *core)
 {
+	unsigned long flags;
 	bool ret = false;
 
+	flags = clk_enable_lock();
+
 	/*
 	 * .is_enabled is only mandatory for clocks that gate
 	 * fall back to software usage counter if .is_enabled is missing
 	 */
-	if (!core->ops->is_enabled)
+	if (!core->ops->is_enabled) {
+		clk_enable_unlock(flags);
 		return core->enable_count;
+	}
 
 	/*
 	 * Check if clock controller's device is runtime active before
@@ -230,6 +235,8 @@ static bool clk_core_is_enabled(struct clk_core *core)
 	if (core->dev)
 		pm_runtime_put(core->dev);
 
+	clk_enable_unlock(flags);
+
 	return ret;
 }
 
-- 
2.7.4




More information about the linux-arm-kernel mailing list