[RESEND PATCH v2 2/8] pwm: stm32: protect common prescaler for all channels
From: Fabrice Gasnier <hidden>
Date: 2018-02-14 10:06:21
Also in:
linux-arm-kernel, linux-pwm, lkml
Subsystem:
pwm subsystem, stm32 timer/lptimer drivers, the rest · Maintainers:
Uwe Kleine-König, Fabrice Gasnier, Linus Torvalds
There may be a race, when configuring two pwm channels, with different prescaler values, when there's no active channel yet. Add mutex lock to avoid concurrent access on pwm apply state. This is also precursor patch for pwm capture support. Signed-off-by: Fabrice Gasnier <redacted> Reviewed-by: Benjamin Gaignard <redacted> --- drivers/pwm/pwm-stm32.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 59524f9..3ac55df 100644
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c@@ -21,6 +21,7 @@ struct stm32_pwm { struct pwm_chip chip; + struct mutex lock; /* protect pwm config/enable */ struct clk *clk; struct regmap *regmap; u32 max_arr;
@@ -213,9 +214,23 @@ static int stm32_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, return ret; } +static int stm32_pwm_apply_locked(struct pwm_chip *chip, struct pwm_device *pwm, + struct pwm_state *state) +{ + struct stm32_pwm *priv = to_stm32_pwm_dev(chip); + int ret; + + /* protect common prescaler for all active channels */ + mutex_lock(&priv->lock); + ret = stm32_pwm_apply(chip, pwm, state); + mutex_unlock(&priv->lock); + + return ret; +} + static const struct pwm_ops stm32pwm_ops = { .owner = THIS_MODULE, - .apply = stm32_pwm_apply, + .apply = stm32_pwm_apply_locked, }; static int stm32_pwm_set_breakinput(struct stm32_pwm *priv,
@@ -335,6 +350,7 @@ static int stm32_pwm_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; + mutex_init(&priv->lock); priv->regmap = ddata->regmap; priv->clk = ddata->clk; priv->max_arr = ddata->max_arr;
--
1.9.1