clk: renesas: div6: Implement range checking
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 1 Apr 2021 13:01:38 +0000 (15:01 +0200)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 11 May 2021 07:58:13 +0000 (09:58 +0200)
Consider the minimum and maximum clock rates imposed by clock users when
calculating the most appropriate clock rate in the .determine_rate()
callback.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/35ceb262c71f1b2e9864a39bde9dafd78b2981f4.1617281699.git.geert+renesas@glider.be
drivers/clk/renesas/clk-div6.c

index a9ac2a83c1d0daa09f1cee800b86333f8c8ef7d6..3abd6e5400aded6aadead32a56f3a061dfc0ac68 100644 (file)
@@ -106,8 +106,8 @@ static int cpg_div6_clock_determine_rate(struct clk_hw *hw,
        unsigned long prate, calc_rate, diff, best_rate, best_prate;
        unsigned int num_parents = clk_hw_get_num_parents(hw);
        struct clk_hw *parent, *best_parent = NULL;
+       unsigned int i, min_div, max_div, div;
        unsigned long min_diff = ULONG_MAX;
-       unsigned int i, div;
 
        for (i = 0; i < num_parents; i++) {
                parent = clk_hw_get_parent_by_index(hw, i);
@@ -118,7 +118,13 @@ static int cpg_div6_clock_determine_rate(struct clk_hw *hw,
                if (!prate)
                        continue;
 
+               min_div = max(DIV_ROUND_UP(prate, req->max_rate), 1UL);
+               max_div = req->min_rate ? min(prate / req->min_rate, 64UL) : 64;
+               if (max_div < min_div)
+                       continue;
+
                div = cpg_div6_clock_calc_div(req->rate, prate);
+               div = clamp(div, min_div, max_div);
                calc_rate = prate / div;
                diff = calc_rate > req->rate ? calc_rate - req->rate
                                             : req->rate - calc_rate;