Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f99ca8f0 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by Greg Kroah-Hartman
Browse files

clk: stratix10: use do_div() for 64-bit calculation 



[ Upstream commit cc26ed7be46c5f5fa45f3df8161ed7ca3c4d318c ]

do_div() macro to perform u64 division and guards against overflow if
the result is too large for the unsigned long return type.

Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Link: https://lkml.kernel.org/r/20200114160726.19771-1-dinguyen@kernel.org


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d4c38bfb

drivers/clk/socfpga/clk-pll-s10.c

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hwclk, 
	/* read VCO1 reg for numerator and denominator */

	reg = readl(socfpgaclk->hw.reg);

	refdiv = (reg & SOCFPGA_PLL_REFDIV_MASK) >> SOCFPGA_PLL_REFDIV_SHIFT;

	vco_freq = (unsigned long long)parent_rate / refdiv;



	vco_freq = parent_rate;

	do_div(vco_freq, refdiv);



	/* Read mdiv and fdiv from the fdbck register */

	reg = readl(socfpgaclk->hw.reg + 0x4);