Commit 3e954d96 authored by Clément Péron's avatar Clément Péron Committed by Thierry Reding

pwm: sun4i: Move pwm_calculate() out of spin_lock()

pwm_calculate() calls clk_get_rate() while holding a spin_lock().

This create an issue as clk_get_rate() may sleep.

Move pwm_calculate() out of this spin_lock().

Fixes: c32c5c50 ("pwm: sun4i: Switch to atomic PWM")
Reported-by: default avatarAlexander Finger <alex.mobigo@gmail.com>
Sugested-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Tested-by: default avatarAlexander Finger <alex.mobigo@gmail.com>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarClément Péron <peron.clem@gmail.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 9f2919e9
...@@ -248,19 +248,18 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -248,19 +248,18 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
} }
} }
spin_lock(&sun4i_pwm->ctrl_lock);
ctrl = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
ret = sun4i_pwm_calculate(sun4i_pwm, state, &duty, &period, &prescaler, ret = sun4i_pwm_calculate(sun4i_pwm, state, &duty, &period, &prescaler,
&bypass); &bypass);
if (ret) { if (ret) {
dev_err(chip->dev, "period exceeds the maximum value\n"); dev_err(chip->dev, "period exceeds the maximum value\n");
spin_unlock(&sun4i_pwm->ctrl_lock);
if (!cstate.enabled) if (!cstate.enabled)
clk_disable_unprepare(sun4i_pwm->clk); clk_disable_unprepare(sun4i_pwm->clk);
return ret; return ret;
} }
spin_lock(&sun4i_pwm->ctrl_lock);
ctrl = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
if (sun4i_pwm->data->has_direct_mod_clk_output) { if (sun4i_pwm->data->has_direct_mod_clk_output) {
if (bypass) { if (bypass) {
ctrl |= BIT_CH(PWM_BYPASS, pwm->hwpwm); ctrl |= BIT_CH(PWM_BYPASS, pwm->hwpwm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment