raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

pwm: stm32: Fix for settings using period > UINT32_MAX

Browse Source 
[ Upstream commit d44d635635 ]

stm32_pwm_config() took the duty_cycle and period values with the type
int, however stm32_pwm_apply() passed u64 values there. Expand the
function parameters to u64 to not discard relevant bits and adapt the
calculations to the wider type.

To ensure the calculations won't overflow, check in .probe() the input
clk doesn't run faster than 1 GHz.

Link: https://lore.kernel.org/r/06b4a650a608d0887d934c1b2b8919e0f78e4db2.1710711976.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Stable-dep-of: c45fcf46ca ("pwm: stm32: Refuse too small period requests")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Uwe Kleine-König
2024-03-17 22:52:15 +01:00
committed by Greg Kroah-Hartman
parent 70b7eb9f0f
commit 131486fb2c
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/pwm/pwm-stm32.c
View File

@@ -309,16 +309,18 @@ unlock:
} }
static int stm32_pwm_config(struct stm32_pwm *priv, unsigned int ch, static int stm32_pwm_config(struct stm32_pwm *priv, unsigned int ch,
int duty_ns, int period_ns) u64 duty_ns, u64 period_ns)
{ {
unsigned long long prd, div, dty; unsigned long long prd, div, dty;
unsigned int prescaler = 0; unsigned int prescaler = 0;
u32 ccmr, mask, shift; u32 ccmr, mask, shift;
/* Period and prescaler values depends on clock rate */ /*
div = (unsigned long long)clk_get_rate(priv->clk) * period_ns; * .probe() asserted that clk_get_rate() is not bigger than 1 GHz, so
* this won't overflow.
do_div(div, NSEC_PER_SEC); */
div = mul_u64_u64_div_u64(period_ns, clk_get_rate(priv->clk),
NSEC_PER_SEC);
prd = div; prd = div;
while (div > priv->max_arr) { while (div > priv->max_arr) {
@@ -351,9 +353,8 @@ static int stm32_pwm_config(struct stm32_pwm *priv, unsigned int ch,
regmap_set_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE); regmap_set_bits(priv->regmap, TIM_CR1, TIM_CR1_ARPE);
/* Calculate the duty cycles */ /* Calculate the duty cycles */
dty = (unsigned long long)clk_get_rate(priv->clk) * duty_ns; dty = mul_u64_u64_div_u64(duty_ns, clk_get_rate(priv->clk),
do_div(dty, prescaler + 1); (u64)NSEC_PER_SEC * (prescaler + 1));
do_div(dty, NSEC_PER_SEC);
regmap_write(priv->regmap, TIM_CCR1 + 4 * ch, dty); regmap_write(priv->regmap, TIM_CCR1 + 4 * ch, dty);
@@ -657,6 +658,17 @@ static int stm32_pwm_probe(struct platform_device *pdev)
stm32_pwm_detect_complementary(priv); stm32_pwm_detect_complementary(priv);
ret = devm_clk_rate_exclusive_get(dev, priv->clk);
if (ret)
return dev_err_probe(dev, ret, "Failed to lock clock\n");
/*
* With the clk running with not more than 1 GHz the calculations in
* .apply() won't overflow.
*/
if (clk_get_rate(priv->clk) > 1000000000)
return dev_err_probe(dev, -EINVAL, "Failed to lock clock\n");
chip->ops = &stm32pwm_ops; chip->ops = &stm32pwm_ops;
/* Initialize clock refcount to number of enabled PWM channels. */ /* Initialize clock refcount to number of enabled PWM channels. */