[6.1.y-cip,04/10] clk: Move no reparent case into a separate function

Commit Message

Biju Das Nov. 22, 2023, 2:31 p.m. UTC

From: Stephen Boyd <[e-mail]>

commit 1b4e99fda73fd030635f378ee059257f6ad0f780 upseam.

We'll need to turn the code in clk_mux_determine_rate_flags() to deal
with CLK_SET_RATE_NO_REPARENT into a helper clock drivers will be able
to use if they don't want to allow reparenting.

Cc: Abel Vesa <[e-mail]>
Cc: Alessandro Zummo <[e-mail]>
Cc: Alexandre Belloni <[e-mail]>
Cc: Alexandre Torgue <[e-mail]>
Cc: "Andreas Färber" <[e-mail]>
Cc: AngeloGioacchino Del Regno <[e-mail]>
Cc: Baolin Wang <[e-mail]>
Cc: Charles Keepax <[e-mail]>
Cc: Chen-Yu Tsai <[e-mail]>
Cc: Chen-Yu Tsai <[e-mail]>
Cc: Chunyan Zhang <[e-mail]>
Cc: Claudiu Beznea <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: David Airlie <[e-mail]>
Cc: David Lechner <[e-mail]>
Cc: Dinh Nguyen <[e-mail]>
Cc: Fabio Estevam <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Cc: Jaroslav Kysela <[e-mail]>
Cc: Jernej Skrabec <[e-mail]>
Cc: Jonathan Hunter <[e-mail]>
Cc: Kishon Vijay Abraham I <[e-mail]>
Cc: Liam Girdwood <[e-mail]>
Cc: Linus Walleij <[e-mail]>
Cc: Luca Ceresoli <[e-mail]>
Cc: Manivannan Sadhasivam <[e-mail]>
Cc: Mark Brown <[e-mail]>
Cc: Markus Schneider-Pargmann <[e-mail]>
Cc: Max Filippov <[e-mail]>
Cc: Maxime Coquelin <[e-mail]>
Cc: Mikko Perttunen <[e-mail]>
Cc: Miles Chen <[e-mail]>
Cc: Nicolas Ferre <[e-mail]>
Cc: Orson Zhai <[e-mail]>
Cc: Paul Cercueil <[e-mail]>
Cc: Peng Fan <[e-mail]>
Cc: Peter De Schrijver <[e-mail]>
Cc: Prashant Gaikwad <[e-mail]>
Cc: Richard Fitzgerald <[e-mail]>
Cc: Samuel Holland <[e-mail]>
Cc: Sascha Hauer <[e-mail]>
Cc: Sekhar Nori <[e-mail]>
Cc: Shawn Guo <[e-mail]>
Cc: Takashi Iwai <[e-mail]>
Cc: Thierry Reding <[e-mail]>
Cc: Ulf Hansson <[e-mail]>
Cc: Vinod Koul <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: NXP Linux Team <[e-mail]>
Cc: [e-mail]
Cc: Pengutronix Kernel Team <[e-mail]>
Signed-off-by: Stephen Boyd <[e-mail]>
Signed-off-by: Maxime Ripard <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Signed-off-by: Biju Das <[e-mail]>
---
 drivers/clk/clk.c | 75 +++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 32 deletions(-)

Patch

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 755df2133800..6ec7cade4c0b 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -583,45 +583,58 @@  clk_core_forward_rate_req(struct clk_core *core,
 		req->max_rate = old_req->max_rate;
 }
 
-int clk_mux_determine_rate_flags(struct clk_hw *hw,
-				 struct clk_rate_request *req,
-				 unsigned long flags)
+static int
+clk_core_determine_rate_no_reparent(struct clk_hw *hw,
+				    struct clk_rate_request *req)
 {
-	struct clk_core *core = hw->core, *parent, *best_parent = NULL;
-	int i, num_parents, ret;
-	unsigned long best = 0;
-
-	/* if NO_REPARENT flag set, pass through to current parent */
-	if (core->flags & CLK_SET_RATE_NO_REPARENT) {
-		parent = core->parent;
-		if (core->flags & CLK_SET_RATE_PARENT) {
-			struct clk_rate_request parent_req;
+	struct clk_core *core = hw->core;
+	struct clk_core *parent = core->parent;
+	unsigned long best;
+	int ret;
 
-			if (!parent) {
-				req->rate = 0;
-				return 0;
-			}
+	if (core->flags & CLK_SET_RATE_PARENT) {
+		struct clk_rate_request parent_req;
 
-			clk_core_forward_rate_req(core, req, parent, &parent_req, req->rate);
+		if (!parent) {
+			req->rate = 0;
+			return 0;
+		}
 
-			trace_clk_rate_request_start(&parent_req);
+		clk_core_forward_rate_req(core, req, parent, &parent_req,
+					  req->rate);
 
-			ret = clk_core_round_rate_nolock(parent, &parent_req);
-			if (ret)
-				return ret;
+		trace_clk_rate_request_start(&parent_req);
 
-			trace_clk_rate_request_done(&parent_req);
+		ret = clk_core_round_rate_nolock(parent, &parent_req);
+		if (ret)
+			return ret;
 
-			best = parent_req.rate;
-		} else if (parent) {
-			best = clk_core_get_rate_nolock(parent);
-		} else {
-			best = clk_core_get_rate_nolock(core);
-		}
+		trace_clk_rate_request_done(&parent_req);
 
-		goto out;
+		best = parent_req.rate;
+	} else if (parent) {
+		best = clk_core_get_rate_nolock(parent);
+	} else {
+		best = clk_core_get_rate_nolock(core);
 	}
 
+	req->rate = best;
+
+	return 0;
+}
+
+int clk_mux_determine_rate_flags(struct clk_hw *hw,
+				 struct clk_rate_request *req,
+				 unsigned long flags)
+{
+	struct clk_core *core = hw->core, *parent, *best_parent = NULL;
+	int i, num_parents, ret;
+	unsigned long best = 0;
+
+	/* if NO_REPARENT flag set, pass through to current parent */
+	if (core->flags & CLK_SET_RATE_NO_REPARENT)
+		return clk_core_determine_rate_no_reparent(hw, req);
+
 	/* find the parent that can provide the fastest rate <= rate */
 	num_parents = core->num_parents;
 	for (i = 0; i < num_parents; i++) {
@@ -659,9 +672,7 @@  int clk_mux_determine_rate_flags(struct clk_hw *hw,
 	if (!best_parent)
 		return -EINVAL;
 
-out:
-	if (best_parent)
-		req->best_parent_hw = best_parent->hw;
+	req->best_parent_hw = best_parent->hw;
 	req->best_parent_rate = best;
 	req->rate = best;