pwm: sun4i: Move pwm_calculate() out of spin_lock()
Subsystems (2)
PATCH v2 1/1 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 c32c5c50d4fe ("pwm: sun4i: Switch to atomic PWM")
Reported-by Alexander Finger <[email protected]>
Sugested-by Vasily Khoruzhick <[email protected]>
Tested-by Alexander Finger <[email protected]>
Reviewed-by Uwe Kleine-König <[email protected]>
Signed-off-by Clément Péron <[email protected]>
---
Changes since v1:
- Fix Alexander in Reported-by tag
- Add Uwe reviewed tag and Alex Tested-by tag
drivers/pwm/pwm-sun4i.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/pwm/pwm-sun4i.c +3 -4
@@ -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, &bypass);if (ret) {dev_err (chip->dev,"period exceeds the maximum value\n" ); -spin_unlock (&sun4i_pwm->ctrl_lock);if (!cstate.enabled)clk_disable_unprepare (sun4i_pwm->clk);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 (bypass) { ctrl |=BIT_CH (PWM_BYPASS , pwm->hwpwm);
Signature · 1 line
2.20.1