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

pwm: lpc18xx: Fix period handling

The calculation:

val = (u64)NSEC_PER_SEC * LPC18XX_PWM_TIMER_MAX;
do_div(val, lpc18xx_pwm->clk_rate);
lpc18xx_pwm->max_period_ns = val;

is bogus because with NSEC_PER_SEC = 1000000000,
LPC18XX_PWM_TIMER_MAX = 0xffffffff and clk_rate < NSEC_PER_SEC this
overflows the (on lpc18xx (i.e. ARM32) 32 bit wide) unsigned int
.max_period_ns. This results (dependant of the actual clk rate) in an
arbitrary limitation of the maximal period. E.g. for clkrate =
333333333 (Hz) we get max_period_ns = 9 instead of 12884901897.

So make .max_period_ns an u64 and pass period and duty as u64 to not
discard relevant digits. And also make use of mul_u64_u64_div_u64()
which prevents all overflows assuming clk_rate < NSEC_PER_SEC.

Fixes: 841e6f90bb78 ("pwm: NXP LPC18xx PWM/SCT driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

authored by

Uwe Kleine-König and committed by
Thierry Reding
8933d30c 2ba1aede

+31 -16
+31 -16
drivers/pwm/pwm-lpc18xx-sct.c
··· 98 98 unsigned long clk_rate; 99 99 unsigned int period_ns; 100 100 unsigned int min_period_ns; 101 - unsigned int max_period_ns; 101 + u64 max_period_ns; 102 102 unsigned int period_event; 103 103 unsigned long event_map; 104 104 struct mutex res_lock; ··· 145 145 mutex_unlock(&lpc18xx_pwm->res_lock); 146 146 } 147 147 148 - static void lpc18xx_pwm_config_period(struct pwm_chip *chip, int period_ns) 148 + static void lpc18xx_pwm_config_period(struct pwm_chip *chip, u64 period_ns) 149 149 { 150 150 struct lpc18xx_pwm_chip *lpc18xx_pwm = to_lpc18xx_pwm_chip(chip); 151 - u64 val; 151 + u32 val; 152 152 153 - val = (u64)period_ns * lpc18xx_pwm->clk_rate; 154 - do_div(val, NSEC_PER_SEC); 153 + /* 154 + * With clk_rate < NSEC_PER_SEC this cannot overflow. 155 + * With period_ns < max_period_ns this also fits into an u32. 156 + * As period_ns >= min_period_ns = DIV_ROUND_UP(NSEC_PER_SEC, lpc18xx_pwm->clk_rate); 157 + * we have val >= 1. 158 + */ 159 + val = mul_u64_u64_div_u64(period_ns, lpc18xx_pwm->clk_rate, NSEC_PER_SEC); 155 160 156 161 lpc18xx_pwm_writel(lpc18xx_pwm, 157 162 LPC18XX_PWM_MATCH(lpc18xx_pwm->period_event), 158 - (u32)val - 1); 163 + val - 1); 159 164 160 165 lpc18xx_pwm_writel(lpc18xx_pwm, 161 166 LPC18XX_PWM_MATCHREL(lpc18xx_pwm->period_event), 162 - (u32)val - 1); 167 + val - 1); 163 168 } 164 169 165 170 static void lpc18xx_pwm_config_duty(struct pwm_chip *chip, 166 - struct pwm_device *pwm, int duty_ns) 171 + struct pwm_device *pwm, u64 duty_ns) 167 172 { 168 173 struct lpc18xx_pwm_chip *lpc18xx_pwm = to_lpc18xx_pwm_chip(chip); 169 174 struct lpc18xx_pwm_data *lpc18xx_data = &lpc18xx_pwm->channeldata[pwm->hwpwm]; 170 - u64 val; 175 + u32 val; 171 176 172 - val = (u64)duty_ns * lpc18xx_pwm->clk_rate; 173 - do_div(val, NSEC_PER_SEC); 177 + /* 178 + * With clk_rate < NSEC_PER_SEC this cannot overflow. 179 + * With duty_ns <= period_ns < max_period_ns this also fits into an u32. 180 + */ 181 + val = mul_u64_u64_div_u64(duty_ns, lpc18xx_pwm->clk_rate, NSEC_PER_SEC); 174 182 175 183 lpc18xx_pwm_writel(lpc18xx_pwm, 176 184 LPC18XX_PWM_MATCH(lpc18xx_data->duty_event), 177 - (u32)val); 185 + val); 178 186 179 187 lpc18xx_pwm_writel(lpc18xx_pwm, 180 188 LPC18XX_PWM_MATCHREL(lpc18xx_data->duty_event), 181 - (u32)val); 189 + val); 182 190 } 183 191 184 192 static int lpc18xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, ··· 383 375 goto disable_pwmclk; 384 376 } 385 377 378 + /* 379 + * If clkrate is too fast, the calculations in .apply() might overflow. 380 + */ 381 + if (lpc18xx_pwm->clk_rate > NSEC_PER_SEC) { 382 + ret = dev_err_probe(&pdev->dev, -EINVAL, "pwm clock to fast\n"); 383 + goto disable_pwmclk; 384 + } 385 + 386 386 mutex_init(&lpc18xx_pwm->res_lock); 387 387 mutex_init(&lpc18xx_pwm->period_lock); 388 388 389 - val = (u64)NSEC_PER_SEC * LPC18XX_PWM_TIMER_MAX; 390 - do_div(val, lpc18xx_pwm->clk_rate); 391 - lpc18xx_pwm->max_period_ns = val; 389 + lpc18xx_pwm->max_period_ns = 390 + mul_u64_u64_div_u64(NSEC_PER_SEC, LPC18XX_PWM_TIMER_MAX, lpc18xx_pwm->clk_rate); 392 391 393 392 lpc18xx_pwm->min_period_ns = DIV_ROUND_UP(NSEC_PER_SEC, 394 393 lpc18xx_pwm->clk_rate);