Revert "clk: Drop the rate range on clk_put()"
Stephen Boyd
maintainerPATCH 1/1 Revert "clk: Drop the rate range on clk_put()"
This reverts commit 7dabfa2bc4803eed83d6f22bd6f045495f40636b. There are multiple reports that this breaks boot on various systems. The common theme is that orphan clks are having rates set on them when that isn't expected. Let's revert it out for now so that -rc1 boots.
--- drivers/clk/clk.c | 42 ++++++---------- drivers/clk/clk_test.c | 108 ----------------------------------------- 2 files changed, 14 insertions(+), 136 deletions(-)
drivers/clk/clk.c +14 -28
@@ -2332,15 +2332,19 @@ int clk_set_rate_exclusive(struct clk *clk, unsigned long rate) }EXPORT_SYMBOL_GPL (clk_set_rate_exclusive); -static int clk_set_rate_range_nolock (struct clk *clk, -unsigned long min, -unsigned long max) +/** +* clk_set_rate_range - set a rate range for a clock source +* @clk: clock source +* @min: desired minimum clock rate in Hz, inclusive +* @max: desired maximum clock rate in Hz, inclusive +* +* Returns success (0) or negative errno. +*/ +int clk_set_rate_range (struct clk *clk,unsigned long min,unsigned long max) {int ret =0 ;unsigned long old_min, old_max, rate; -lockdep_assert_held (&prepare_lock); -if (!clk)return 0 ;
@@ -2353,6 +2357,8 @@ static int clk_set_rate_range_nolock(struct clk *clk,return -EINVAL ; } +clk_prepare_lock (); +if (clk->exclusive_count)clk_core_rate_unprotect (clk->core);
@@ -2396,28 +2402,6 @@ static int clk_set_rate_range_nolock(struct clk *clk,if (clk->exclusive_count)clk_core_rate_protect (clk->core); -return ret; -} - -/** -* clk_set_rate_range - set a rate range for a clock source -* @clk: clock source -* @min: desired minimum clock rate in Hz, inclusive -* @max: desired maximum clock rate in Hz, inclusive -* -* Return: 0 for success or negative errno on failure. -*/ -int clk_set_rate_range (struct clk *clk,unsigned long min,unsigned long max) -{ -int ret; - -if (!clk) -return 0 ; - -clk_prepare_lock (); - - ret =clk_set_rate_range_nolock (clk, min, max); -clk_prepare_unlock ();return ret;
@@ -4419,7 +4403,9 @@ void __clk_put(struct clk *clk) }hlist_del (&clk->clks_node); -clk_set_rate_range_nolock (clk,0 ,ULONG_MAX ); +if (clk->min_rate > clk->core->req_rate || + clk->max_rate < clk->core->req_rate) +clk_core_set_rate_nolock (clk->core, clk->core->req_rate); owner = clk->core->owner;kref_put (&clk->core->ref, __clk_release);
drivers/clk/clk_test.c +0 -108
126 lines not on this page · raw message
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Quoted 5 lines · Stephen Boyd
This reverts commit
7dabfa2bc4803eed83d6f22bd6f045495f40636b. There are multiple reports that this breaks boot on various systems. The common theme is that orphan clks are having rates set on them when that isn't expected. Let's revert it out for now so that -rc1 boots.
Quoted 7 lines
Reported-by Marek Szyprowski <[email protected]>Reported-by Tony Lindgren <[email protected]>Reported-by Alexander Stein <[email protected]>Reported-by Naresh Kamboju <[email protected]>Cc Maxime Ripard <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
I really like the attention it's getting now that it's broken, we can fix a lot of things :)
It doesn't seem to be restricted to orphan clocks though :/
But obviously,
Thanks!
Maxime
Stephen Boyd
maintainerQuoting Maxime Ripard (2022-04-04 00:29:00)
Quoted 14 lines · Stephen Boyd
Quoted 5 lines
This reverts commit
7dabfa2bc4803eed83d6f22bd6f045495f40636b. There are multiple reports that this breaks boot on various systems. The common theme is that orphan clks are having rates set on them when that isn't expected. Let's revert it out for now so that -rc1 boots.Quoted 7 lines
Reported-by Marek Szyprowski <[email protected]>Reported-by Tony Lindgren <[email protected]>Reported-by Alexander Stein <[email protected]>Reported-by Naresh Kamboju <[email protected]>Cc Maxime Ripard <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 2 lines
I really like the attention it's getting now that it's broken, we can fix a lot of things :)
Sure! Except that can quickly turn into other attention.
Quoted 2 lines
It doesn't seem to be restricted to orphan clocks though :/
Oof ok. I was busy last week so couldn't pay much attention.
Quoted 3 lines
But obviously,
Acked-by Maxime Ripard <[email protected]>
Thanks. Looks like it just made -rc1 so we can work through the fix at a more leisurely pace now.