]> git.dujemihanovic.xyz Git - linux.git/commitdiff
clk: qcom: clk-rcg2: Take clock boundaries into consideration for gfx3d
authorMaxime Ripard <maxime@cerno.tech>
Tue, 16 Aug 2022 11:25:29 +0000 (13:25 +0200)
committerStephen Boyd <sboyd@kernel.org>
Thu, 15 Sep 2022 16:32:29 +0000 (09:32 -0700)
The gfx3d clock is hand-crafting its own clk_rate_request in
clk_gfx3d_determine_rate to pass to the parent of that clock.

However, since the clk_rate_request is zero'd at creation, it will have
a max_rate of 0 which will break any code depending on the clock
boundaries.

That includes the recent commit 948fb0969eae ("clk: Always clamp the
rounded rate") which will clamp the rate given to clk_round_rate() to
the current clock boundaries.

For the gfx3d clock, it means that since both the min_rate and max_rate
fields are set at zero, clk_round_rate() now always return 0.

Let's initialize the min_rate and max_rate fields properly for that
clock.

Fixes: 948fb0969eae ("clk: Always clamp the rounded rate")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220816112530.1837489-25-maxime@cerno.tech
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/qcom/clk-rcg2.c

index 28019edd2a5082e6c1e2a0b420ef6c05b25a2b6b..ee536b4579523118ab56bad03d62e75616531617 100644 (file)
@@ -908,6 +908,15 @@ static int clk_gfx3d_determine_rate(struct clk_hw *hw,
                req->best_parent_hw = p2;
        }
 
+       clk_hw_get_rate_range(req->best_parent_hw,
+                             &parent_req.min_rate, &parent_req.max_rate);
+
+       if (req->min_rate > parent_req.min_rate)
+               parent_req.min_rate = req->min_rate;
+
+       if (req->max_rate < parent_req.max_rate)
+               parent_req.max_rate = req->max_rate;
+
        ret = __clk_determine_rate(req->best_parent_hw, &parent_req);
        if (ret)
                return ret;