]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
clk: tegra: super: Switch to determine_rate
authorMaxime Ripard <maxime@cerno.tech>
Fri, 5 May 2023 11:26:07 +0000 (13:26 +0200)
committerStephen Boyd <sboyd@kernel.org>
Fri, 9 Jun 2023 01:39:35 +0000 (18:39 -0700)
The Tegra super clocks implements a mux with a set_parent hook, but
doesn't provide a determine_rate implementation.

This is a bit odd, since set_parent() is there to, as its name implies,
change the parent of a clock. However, the most likely candidate to
trigger that parent change is a call to clk_set_rate(), with
determine_rate() figuring out which parent is the best suited for a
given rate.

The other trigger would be a call to clk_set_parent(), but it's far less
used, and it doesn't look like there's any obvious user for that clock.

So, the set_parent hook is effectively unused, possibly because of an
oversight. However, it could also be an explicit decision by the
original author to avoid any reparenting but through an explicit call to
clk_set_parent().

The driver does implement round_rate() though, which means that we can
change the rate of the clock, but we will never get to change the
parent.

However, It's hard to tell whether it's been done on purpose or not.

Since we'll start mandating a determine_rate() implementation, let's
convert the round_rate() implementation to a determine_rate(), which
will also make the current behavior explicit. And if it was an
oversight, the clock behaviour can be adjusted later on.

Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Peter De Schrijver <pdeschrijver@nvidia.com>
Cc: Prashant Gaikwad <pgaikwad@nvidia.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-tegra@vger.kernel.org
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20221018-clk-range-checks-fixes-v4-65-971d5077e7d2@cerno.tech
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/tegra/clk-super.c

index 3f3a7a203c5fda1f276cad7e798f3d6e40226662..7ec47942720c5aa43f35107369b42804f4847b97 100644 (file)
@@ -142,15 +142,22 @@ static const struct clk_ops tegra_clk_super_mux_ops = {
        .restore_context = clk_super_mux_restore_context,
 };
 
-static long clk_super_round_rate(struct clk_hw *hw, unsigned long rate,
-                                unsigned long *parent_rate)
+static int clk_super_determine_rate(struct clk_hw *hw,
+                                   struct clk_rate_request *req)
 {
        struct tegra_clk_super_mux *super = to_clk_super_mux(hw);
        struct clk_hw *div_hw = &super->frac_div.hw;
+       unsigned long rate;
 
        __clk_hw_set_clk(div_hw, hw);
 
-       return super->div_ops->round_rate(div_hw, rate, parent_rate);
+       rate = super->div_ops->round_rate(div_hw, req->rate,
+                                         &req->best_parent_rate);
+       if (rate < 0)
+               return rate;
+
+       req->rate = rate;
+       return 0;
 }
 
 static unsigned long clk_super_recalc_rate(struct clk_hw *hw,
@@ -193,7 +200,7 @@ const struct clk_ops tegra_clk_super_ops = {
        .get_parent = clk_super_get_parent,
        .set_parent = clk_super_set_parent,
        .set_rate = clk_super_set_rate,
-       .round_rate = clk_super_round_rate,
+       .determine_rate = clk_super_determine_rate,
        .recalc_rate = clk_super_recalc_rate,
        .restore_context = clk_super_restore_context,
 };