From: Miquel Raynal <miquel.raynal@bootlin.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Danilo Krummrich <dakr@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: "Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-clk@vger.kernel.org, "Chen-Yu Tsai" <wenst@chromium.org>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Marek Vasut" <marex@denx.de>,
"Ulf Hansson" <ulf.hansson@linaro.org>,
"Kevin Hilman" <khilman@kernel.org>,
"Fabio Estevam" <festevam@denx.de>,
"Jacky Bai" <ping.bai@nxp.com>, "Peng Fan" <peng.fan@nxp.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Shengjiu Wang" <shengjiu.wang@nxp.com>,
linux-imx@nxp.com, "Ian Ray" <ian.ray@gehealthcare.com>,
"Hervé Codina" <herve.codina@bootlin.com>,
"Luca Ceresoli" <luca.ceresoli@bootlin.com>,
"Saravana Kannan" <saravanak@google.com>,
"Miquel Raynal" <miquel.raynal@bootlin.com>
Subject: [PATCH RFC 09/10] clk: Make sure clock parents and children are resumed when necessary
Date: Wed, 26 Mar 2025 19:26:24 +0100 [thread overview]
Message-ID: <20250326-cross-lock-dep-v1-9-3199e49e8652@bootlin.com> (raw)
In-Reply-To: <20250326-cross-lock-dep-v1-0-3199e49e8652@bootlin.com>
Any pm_runtime_get() call will both wake up the core clock as well as
its parents. But there are some cases which also require resuming the
children clocks. One way to do that is to use the new
pm_runtime_get_consumers() helper.
It's been identified that the following situation may require resuming
the children:
- getting the rate
- setting the rate
- changing the parent (especially since it may produce rate changes)
- putting the clock, which may involve reparenting as well
In order to fix the ABBA locking situation between clock and power
domains, let's disimburse these two locks by resuming the children
outside of the prepare_lock in one function call by using this new
helper.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
drivers/clk/clk.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 339ebfa8cca729ffb84127e01a21f741bc270cb3..26af3a134fa7b9d7f4a77ff473df7e79fd465789 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -119,6 +119,20 @@ static int clk_pm_runtime_get(struct clk_core *core)
return pm_runtime_resume_and_get(core->dev);
}
+static int clk_pm_runtime_get_and_consumers(struct clk_core *core)
+{
+ int ret;
+
+ if (!core || !core->rpm_enabled)
+ return 0;
+
+ ret = pm_runtime_resume_and_get(core->dev);
+ if (!ret)
+ pm_runtime_get_consumers(core->dev);
+
+ return ret;
+}
+
static int clk_pm_runtime_get_if_active(struct clk_core *core)
{
int ret;
@@ -141,6 +155,16 @@ static void clk_pm_runtime_put(struct clk_core *core)
pm_runtime_put_sync(core->dev);
}
+static void clk_pm_runtime_put_and_consumers(struct clk_core *core)
+{
+ if (!core || !core->rpm_enabled)
+ return;
+
+ pm_runtime_put_consumers(core->dev);
+
+ pm_runtime_put_sync(core->dev);
+}
+
/**
* clk_pm_runtime_get_all() - Runtime "get" all clk provider devices
*
@@ -2010,10 +2034,15 @@ unsigned long clk_get_rate(struct clk *clk)
if (!clk)
return 0;
+ if (clk_pm_runtime_get_and_consumers(clk->core))
+ return 0;
+
clk_prepare_lock();
rate = clk_core_get_rate_recalc(clk->core);
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(clk->core);
+
return rate;
}
EXPORT_SYMBOL_GPL(clk_get_rate);
@@ -2605,6 +2634,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
if (!clk)
return 0;
+ ret = clk_pm_runtime_get_and_consumers(clk->core);
+ if (ret)
+ return ret;
+
/* prevent racing with updates to the clock topology */
clk_prepare_lock();
@@ -2618,6 +2651,8 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(clk->core);
+
return ret;
}
EXPORT_SYMBOL_GPL(clk_set_rate);
@@ -2648,6 +2683,10 @@ int clk_set_rate_exclusive(struct clk *clk, unsigned long rate)
if (!clk)
return 0;
+ ret = clk_pm_runtime_get_and_consumers(clk->core);
+ if (ret)
+ return ret;
+
/* prevent racing with updates to the clock topology */
clk_prepare_lock();
@@ -2665,6 +2704,8 @@ int clk_set_rate_exclusive(struct clk *clk, unsigned long rate)
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(clk->core);
+
return ret;
}
EXPORT_SYMBOL_GPL(clk_set_rate_exclusive);
@@ -2755,12 +2796,18 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max)
if (!clk)
return 0;
+ ret = clk_pm_runtime_get_and_consumers(clk->core);
+ if (ret)
+ return ret;
+
clk_prepare_lock();
ret = clk_set_rate_range_nolock(clk, min, max);
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(clk->core);
+
return ret;
}
EXPORT_SYMBOL_GPL(clk_set_rate_range);
@@ -2964,6 +3011,10 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
if (!clk)
return 0;
+ ret = clk_pm_runtime_get_and_consumers(clk->core);
+ if (ret)
+ return ret;
+
clk_prepare_lock();
if (clk->exclusive_count)
@@ -2977,6 +3028,8 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(clk->core);
+
return ret;
}
EXPORT_SYMBOL_GPL(clk_set_parent);
@@ -3459,10 +3512,16 @@ static int clk_rate_set(void *data, u64 val)
struct clk_core *core = data;
int ret;
+ ret = clk_pm_runtime_get_and_consumers(core);
+ if (ret)
+ return ret;
+
clk_prepare_lock();
ret = clk_core_set_rate_nolock(core, val);
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(core);
+
return ret;
}
@@ -3518,11 +3577,18 @@ DEFINE_DEBUGFS_ATTRIBUTE(clk_prepare_enable_fops, clk_prepare_enable_get,
static int clk_rate_get(void *data, u64 *val)
{
struct clk_core *core = data;
+ int ret;
+
+ ret = clk_pm_runtime_get_and_consumers(core);
+ if (ret)
+ return ret;
clk_prepare_lock();
*val = clk_core_get_rate_recalc(core);
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(core);
+
return 0;
}
@@ -3659,12 +3725,18 @@ static ssize_t current_parent_write(struct file *file, const char __user *ubuf,
if (!parent)
return -ENOENT;
+ err = clk_pm_runtime_get_and_consumers(parent);
+ if (err)
+ return err;
+
clk_prepare_lock();
err = clk_core_set_parent_nolock(core, parent);
clk_prepare_unlock();
if (err)
return err;
+ clk_pm_runtime_put_and_consumers(parent);
+
return count;
}
@@ -4762,6 +4834,9 @@ void __clk_put(struct clk *clk)
if (!clk || WARN_ON_ONCE(IS_ERR(clk)))
return;
+ if (clk_pm_runtime_get_and_consumers(clk->core))
+ return;
+
clk_prepare_lock();
/*
@@ -4784,6 +4859,8 @@ void __clk_put(struct clk *clk)
clk_prepare_unlock();
+ clk_pm_runtime_put_and_consumers(clk->core);
+
owner = clk->core->owner;
kref_put(&clk->core->ref, __clk_release);
module_put(owner);
--
2.48.1
next prev parent reply other threads:[~2025-03-26 18:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-26 18:26 [PATCH RFC 00/10] Fix the ABBA locking situation between clk and runtime PM Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 01/10] PM: runtime: Add helpers to resume consumers Miquel Raynal
2025-03-26 19:18 ` Rafael J. Wysocki
2025-03-28 9:59 ` Miquel Raynal
2025-04-09 17:55 ` Rafael J. Wysocki
2025-04-10 7:54 ` Miquel Raynal
2025-04-10 9:55 ` Rafael J. Wysocki
2025-03-26 18:26 ` [PATCH RFC 02/10] clk: Improve comments with usual punctuation Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 03/10] clk: Avoid non needed runtime PM calls Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 04/10] clk: Avoid open coded-logic when a there is a helper available Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 05/10] clk: Move runtime PM calls out of the prepare_lock in clk_init() Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 06/10] clk: Move runtime PM calls out of the prepare_lock in clk_prepare() Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 07/10] clk: Ensure all RPM enabled clocks are enabled before reparenting orphans Miquel Raynal
2025-03-26 18:26 ` [PATCH RFC 08/10] clk: Move runtime PM calls out of the prepare_lock in clk_unregister() Miquel Raynal
2025-03-26 18:26 ` Miquel Raynal [this message]
2025-04-09 18:01 ` [PATCH RFC 09/10] clk: Make sure clock parents and children are resumed when necessary Rafael J. Wysocki
2025-03-26 18:26 ` [PATCH RFC 10/10] clk: Fix the ABBA locking issue with runtime PM subcalls Miquel Raynal
2025-04-15 1:00 ` [PATCH RFC 00/10] Fix the ABBA locking situation between clk and runtime PM Stephen Boyd
2025-10-03 16:24 ` Luca Ceresoli
2026-01-07 10:50 ` Luca Ceresoli
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=20250326-cross-lock-dep-v1-9-3199e49e8652@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=dakr@kernel.org \
--cc=festevam@denx.de \
--cc=gregkh@linuxfoundation.org \
--cc=herve.codina@bootlin.com \
--cc=ian.ray@gehealthcare.com \
--cc=khilman@kernel.org \
--cc=l.stach@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=len.brown@intel.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=luca.ceresoli@bootlin.com \
--cc=marex@denx.de \
--cc=mturquette@baylibre.com \
--cc=pavel@ucw.cz \
--cc=peng.fan@nxp.com \
--cc=ping.bai@nxp.com \
--cc=rafael@kernel.org \
--cc=saravanak@google.com \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=shengjiu.wang@nxp.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=ulf.hansson@linaro.org \
--cc=wenst@chromium.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®