clk: fix critical clock locking

The critical clock handling in __clk_core_init isn't taking the enable lock
before calling clk_core_enable, which in turns triggers the warning in the
lockdep_assert_held call in that function when lockep is enabled.

Add the calls to clk_enable_lock/unlock to make sure it doesn't happen.

Fixes: 32b9b1096186 ("clk: Allow clocks to be marked as CRITICAL")
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index ce39add5a258f404a9560a83c40e654906061904..d584004f7af7d193d5f2646b482f26ce442deeef 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2404,8 +2404,13 @@ static int __clk_core_init(struct clk_core *core)
                core->ops->init(core->hw);
 
        if (core->flags & CLK_IS_CRITICAL) {
+               unsigned long flags;
+
                clk_core_prepare(core);
+
+               flags = clk_enable_lock();
                clk_core_enable(core);
+               clk_enable_unlock(flags);
        }
 
        kref_init(&core->ref);