Skip to contentSkip to conversation

clk: tegra: Avoid calling an uninitialized function

PATCH Applied Thierry Reding 2 participants 2 messages Jun 30, 2023 – Jul 4, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: tegra: Avoid calling an uninitialized function

From: Thierry Reding <[email protected]>

Commit 493ffb046cf5 ("clk: tegra: super: Switch to determine_rate") replaced clk_super_round_rate() by clk_super_determine_rate(), but didn't update one callsite that was explicitly calling the old tegra_clk_super_ops.round_rate() function, which was now NULL. This resulted in a crash on Tegra30 systems during early boot.

Switch this callsite over to the clk_super_determine_rate() equivalent to avoid the crash.

Fixes 493ffb046cf5 ("clk: tegra: super: Switch to determine_rate")
---
 drivers/clk/tegra/clk-tegra-super-cclk.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/clk/tegra/clk-tegra-super-cclk.c +12 -3
index 68d7bcd5fc8a..3b22a4d0dffc 100644
@@ -86,9 +86,18 @@ static int cclk_super_determine_rate(struct clk_hw *hw,
 	if (rate <= pllp_rate) {
 		if (super->flags & TEGRA20_SUPER_CLK)
 			rate = pllp_rate;
-		else
-			rate = tegra_clk_super_ops.round_rate(hw, rate,
-							      &pllp_rate);
+		else {
+			struct clk_rate_request parent = {
+				.rate = req->rate,
+				.best_parent_rate = pllp_rate,
+			};
+
+			clk_hw_get_rate_range(hw, &parent.min_rate,
+					      &parent.max_rate);
+			tegra_clk_super_ops.determine_rate(hw, &parent);
+			pllp_rate = parent.best_parent_rate;
+			rate = parent.rate;
+		}
 
 		req->best_parent_rate = pllp_rate;
 		req->best_parent_hw = pllp_hw;
Signature · 1 line
2.41.0
maintainer Applied
#1 lore raw

Quoting Thierry Reding (2023-06-30 06:07:48)

Quoted 8 lines

From: Thierry Reding <[email protected]>

Commit 493ffb046cf5 ("clk: tegra: super: Switch to determine_rate") replaced clk_super_round_rate() by clk_super_determine_rate(), but didn't update one callsite that was explicitly calling the old tegra_clk_super_ops.round_rate() function, which was now NULL. This resulted in a crash on Tegra30 systems during early boot.

Quoted 7 lines

Switch this callsite over to the clk_super_determine_rate() equivalent to avoid the crash.

Fixes 493ffb046cf5 ("clk: tegra: super: Switch to determine_rate")

---

Applied to clk-next