Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 577b32ab authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

Revert "clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops" 



[ Upstream commit abb5f3f4b1f5f0ad50eb067a00051d3587dec9fb ]

This reverts commit 35b0fac808b95eea1212f8860baf6ad25b88b087. Alexander
reports that it causes boot failures on i.MX8M Plus based boards
(specifically imx8mp-tqma8mpql-mba8mpxl.dts).

Reported-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Cc: Chen-Yu Tsai <wenst@chromium.org>
Fixes: 35b0fac808b9 ("clk: core: Honor CLK_OPS_PARENT_ENABLE for clk gate ops")
Link: https://lore.kernel.org/r/12115951.O9o76ZdvQC@steina-w


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20220831175326.2523912-1-sboyd@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 582e87c6

drivers/clk/clk.c

+0 −28
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ static bool clk_core_rate_is_protected(struct clk_core *core) 
	return core->protect_count;

}



static int clk_core_prepare_enable(struct clk_core *core);

static void clk_core_disable_unprepare(struct clk_core *core);



static bool clk_core_is_prepared(struct clk_core *core)

{

	bool ret = false;
@@ -218,11 +215,7 @@ static bool clk_core_is_prepared(struct clk_core *core) 
		return core->prepare_count;



	if (!clk_pm_runtime_get(core)) {

		if (core->flags & CLK_OPS_PARENT_ENABLE)

			clk_core_prepare_enable(core->parent);

		ret = core->ops->is_prepared(core->hw);

		if (core->flags & CLK_OPS_PARENT_ENABLE)

			clk_core_disable_unprepare(core->parent);

		clk_pm_runtime_put(core);

	}
@@ -258,13 +251,7 @@ static bool clk_core_is_enabled(struct clk_core *core) 
		}

	}



	if (core->flags & CLK_OPS_PARENT_ENABLE)

		clk_core_prepare_enable(core->parent);



	ret = core->ops->is_enabled(core->hw);



	if (core->flags & CLK_OPS_PARENT_ENABLE)

		clk_core_disable_unprepare(core->parent);

done:

	if (core->rpm_enabled)

		pm_runtime_put(core->dev);
@@ -837,9 +824,6 @@ int clk_rate_exclusive_get(struct clk *clk) 
}

EXPORT_SYMBOL_GPL(clk_rate_exclusive_get);



static int clk_core_enable_lock(struct clk_core *core);

static void clk_core_disable_lock(struct clk_core *core);



static void clk_core_unprepare(struct clk_core *core)

{

	lockdep_assert_held(&prepare_lock);
@@ -863,9 +847,6 @@ static void clk_core_unprepare(struct clk_core *core) 


	WARN(core->enable_count > 0, "Unpreparing enabled %s\n", core->name);



	if (core->flags & CLK_OPS_PARENT_ENABLE)

		clk_core_enable_lock(core->parent);



	trace_clk_unprepare(core);



	if (core->ops->unprepare)
@@ -874,9 +855,6 @@ static void clk_core_unprepare(struct clk_core *core) 
	clk_pm_runtime_put(core);



	trace_clk_unprepare_complete(core);



	if (core->flags & CLK_OPS_PARENT_ENABLE)

		clk_core_disable_lock(core->parent);

	clk_core_unprepare(core->parent);

}
@@ -925,9 +903,6 @@ static int clk_core_prepare(struct clk_core *core) 
		if (ret)

			goto runtime_put;



		if (core->flags & CLK_OPS_PARENT_ENABLE)

			clk_core_enable_lock(core->parent);



		trace_clk_prepare(core);



		if (core->ops->prepare)
@@ -935,9 +910,6 @@ static int clk_core_prepare(struct clk_core *core) 


		trace_clk_prepare_complete(core);



		if (core->flags & CLK_OPS_PARENT_ENABLE)

			clk_core_disable_lock(core->parent);



		if (ret)

			goto unprepare;

	}