From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org, Rob Clark <robclark@gmail.com>,
Sean Paul <seanpaul@chromium.org>
Subject: [RFC] clk: Remove cached cores in parent map during unregister
Date: Mon, 22 Jul 2019 22:14:46 -0700 [thread overview]
Message-ID: <20190723051446.20013-1-bjorn.andersson@linaro.org> (raw)
As clocks are registered their parents are resolved and the parent_map
is updated to cache the clk_core objects of each existing parent.
But in the event of a clock being unregistered this cache will carry
dangling pointers if not invalidated, so do this for all children of the
clock being unregistered.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
This resolves the issue seen where the DSI PLL (and it's provided clocks) is
being registered and unregistered multiple times due to probe deferral.
Marking it RFC because I don't fully understand the life of the clock yet.
drivers/clk/clk.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index c0990703ce54..8cd1ad977c50 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2423,11 +2423,14 @@ bool clk_has_parent(struct clk *clk, struct clk *parent)
EXPORT_SYMBOL_GPL(clk_has_parent);
static int clk_core_set_parent_nolock(struct clk_core *core,
- struct clk_core *parent)
+ struct clk_core *parent,
+ bool invalidate_parent)
{
+ struct clk_core *old_parent = core->parent;
int ret = 0;
int p_index = 0;
unsigned long p_rate = 0;
+ int i;
lockdep_assert_held(&prepare_lock);
@@ -2481,6 +2484,14 @@ static int clk_core_set_parent_nolock(struct clk_core *core,
__clk_recalc_accuracies(core);
}
+ /* invalidate the parent cache */
+ if (!parent && invalidate_parent) {
+ for (i = 0; i < core->num_parents; i++) {
+ if (core->parents[i].core == old_parent)
+ core->parents[i].core = NULL;
+ }
+ }
+
runtime_put:
clk_pm_runtime_put(core);
@@ -2517,7 +2528,8 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
clk_core_rate_unprotect(clk->core);
ret = clk_core_set_parent_nolock(clk->core,
- parent ? parent->core : NULL);
+ parent ? parent->core : NULL,
+ false);
if (clk->exclusive_count)
clk_core_rate_protect(clk->core);
@@ -3772,7 +3784,7 @@ void clk_unregister(struct clk *clk)
/* Reparent all children to the orphan list. */
hlist_for_each_entry_safe(child, t, &clk->core->children,
child_node)
- clk_core_set_parent_nolock(child, NULL);
+ clk_core_set_parent_nolock(child, NULL, true);
}
hlist_del_init(&clk->core->child_node);
--
2.18.0
next reply other threads:[~2019-07-23 5:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 5:14 Bjorn Andersson [this message]
2019-07-29 22:46 ` [RFC] clk: Remove cached cores in parent map during unregister Stephen Boyd
2019-08-21 18:10 ` Stephen Boyd
2019-08-21 18:42 ` saiprakash.ranjan
2019-08-26 21:24 ` Stephen Boyd
2019-09-17 15:34 ` Raul Rangel
2019-09-17 15:55 ` Sai Prakash Ranjan
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=20190723051446.20013-1-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=robclark@gmail.com \
--cc=sboyd@kernel.org \
--cc=seanpaul@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;
as well as URLs for NNTP newsgroup(s).