Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: renesas: rcar-gen2: Switch Z clock to .determine_rate()

As the .round_rate() callback returns a long clock rate, it cannot
return clock rates that do not fit in signed long, but do fit in
unsigned long. Hence switch the Z clock on R-Car Gen2 from the old
.round_rate() callback to the newer .determine_rate() callback, which
does not suffer from this limitation.

This includes implementing range checking.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20190830134515.11925-7-geert+renesas@glider.be

+13 -10
+13 -10
drivers/clk/renesas/rcar-gen2-cpg.c
··· 63 63 return div_u64((u64)parent_rate * mult, 32); 64 64 } 65 65 66 - static long cpg_z_clk_round_rate(struct clk_hw *hw, unsigned long rate, 67 - unsigned long *parent_rate) 66 + static int cpg_z_clk_determine_rate(struct clk_hw *hw, 67 + struct clk_rate_request *req) 68 68 { 69 - unsigned long prate = *parent_rate; 70 - unsigned int mult; 69 + unsigned long prate = req->best_parent_rate; 70 + unsigned int min_mult, max_mult, mult; 71 71 72 - if (!prate) 73 - prate = 1; 72 + min_mult = max(div64_ul(req->min_rate * 32ULL, prate), 1ULL); 73 + max_mult = min(div64_ul(req->max_rate * 32ULL, prate), 32ULL); 74 + if (max_mult < min_mult) 75 + return -EINVAL; 74 76 75 - mult = div64_ul(rate * 32ULL, prate); 76 - mult = clamp(mult, 1U, 32U); 77 + mult = div64_ul(req->rate * 32ULL, prate); 78 + mult = clamp(mult, min_mult, max_mult); 77 79 78 - return div_u64((u64)*parent_rate * mult, 32); 80 + req->rate = div_u64((u64)prate * mult, 32); 81 + return 0; 79 82 } 80 83 81 84 static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, ··· 129 126 130 127 static const struct clk_ops cpg_z_clk_ops = { 131 128 .recalc_rate = cpg_z_clk_recalc_rate, 132 - .round_rate = cpg_z_clk_round_rate, 129 + .determine_rate = cpg_z_clk_determine_rate, 133 130 .set_rate = cpg_z_clk_set_rate, 134 131 }; 135 132