| Message ID | 20171223213832.16552-1-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sat, 2017-12-23 at 22:38 +0100, Martin Blumenstingl wrote: > "rem * SDM_DEN" can easily overflow on the 32-bit Meson8 and Meson8b > SoCs if the "remainder" (after the division operation) is greater than > 262143Hz. This is likely to happen since the input clock for the MPLLs > on Meson8 and Meson8b is "fixed_pll", which is running at a rate of > 2550MHz. > > One example where this was observed to be problematic was the Ethernet > clock calculation (which takes MPLL2 as input). When requesting a rate > of 125MHz there is a remainder of 2500000Hz. > The resulting MPLL2 rate before this patch was 127488329Hz. > The resulting MPLL2 rate after this patch is 124999103Hz. > > Commit b609338b26f5 ("clk: meson: mpll: use 64bit math in > rate_from_params") already fixed a similar issue in rate_from_params. > > Fixes: 007e6e5c5f01d3 ("clk: meson: mpll: add rw operation") > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Good catch ! Applied to next/drivers
diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c index 44a5a535ca63..5144360e2c80 100644 --- a/drivers/clk/meson/clk-mpll.c +++ b/drivers/clk/meson/clk-mpll.c @@ -98,7 +98,7 @@ static void params_from_rate(unsigned long requested_rate, *sdm = SDM_DEN - 1; } else { *n2 = div; - *sdm = DIV_ROUND_UP(rem * SDM_DEN, requested_rate); + *sdm = DIV_ROUND_UP_ULL((u64)rem * SDM_DEN, requested_rate); } }
"rem * SDM_DEN" can easily overflow on the 32-bit Meson8 and Meson8b SoCs if the "remainder" (after the division operation) is greater than 262143Hz. This is likely to happen since the input clock for the MPLLs on Meson8 and Meson8b is "fixed_pll", which is running at a rate of 2550MHz. One example where this was observed to be problematic was the Ethernet clock calculation (which takes MPLL2 as input). When requesting a rate of 125MHz there is a remainder of 2500000Hz. The resulting MPLL2 rate before this patch was 127488329Hz. The resulting MPLL2 rate after this patch is 124999103Hz. Commit b609338b26f5 ("clk: meson: mpll: use 64bit math in rate_from_params") already fixed a similar issue in rate_from_params. Fixes: 007e6e5c5f01d3 ("clk: meson: mpll: add rw operation") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/clk/meson/clk-mpll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)