]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: Remove prepare_lock hold assertion in __clk_release()
authorStephen Boyd <sboyd@kernel.org>
Mon, 25 Mar 2024 18:41:55 +0000 (11:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Apr 2024 15:11:37 +0000 (17:11 +0200)
[ Upstream commit 8358a76cfb47c9a5af627a0c4e7168aa14fa25f6 ]

Removing this assertion lets us move the kref_put() call outside the
prepare_lock section. We don't need to hold the prepare_lock here to
free memory and destroy the clk_core structure. We've already unlinked
the clk from the clk tree and by the time the release function runs
nothing holds a reference to the clk_core anymore so anything with the
pointer can't access the memory that's being freed anyway. Way back in
commit 496eadf821c2 ("clk: Use lockdep asserts to find missing hold of
prepare_lock") we didn't need to have this assertion either.

Fixes: 496eadf821c2 ("clk: Use lockdep asserts to find missing hold of prepare_lock")
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20240325184204.745706-2-sboyd@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/clk.c

index 50228cb0c5590f04dea17de5e65c1ecbebb138ac..ac5be561ccdc92c04f57000d1455edaa4f5d7fd4 100644 (file)
@@ -4313,8 +4313,6 @@ static void __clk_release(struct kref *ref)
 {
        struct clk_core *core = container_of(ref, struct clk_core, ref);
 
-       lockdep_assert_held(&prepare_lock);
-
        clk_core_free_parent_map(core);
        kfree_const(core->name);
        kfree(core);