浏览代码

pwm: stm32: Protect common prescaler for all channels

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 <fabrice.gasnier@st.com>
Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Fabrice Gasnier 7 年之前
父节点
当前提交
4eb67a2096
共有 1 个文件被更改,包括 17 次插入1 次删除
  1. 17 1
      drivers/pwm/pwm-stm32.c

+ 17 - 1
drivers/pwm/pwm-stm32.c

@@ -20,6 +20,7 @@
 
 
 struct stm32_pwm {
 struct stm32_pwm {
 	struct pwm_chip chip;
 	struct pwm_chip chip;
+	struct mutex lock; /* protect pwm config/enable */
 	struct clk *clk;
 	struct clk *clk;
 	struct regmap *regmap;
 	struct regmap *regmap;
 	u32 max_arr;
 	u32 max_arr;
@@ -212,9 +213,23 @@ static int stm32_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	return ret;
 	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 = {
 static const struct pwm_ops stm32pwm_ops = {
 	.owner = THIS_MODULE,
 	.owner = THIS_MODULE,
-	.apply = stm32_pwm_apply,
+	.apply = stm32_pwm_apply_locked,
 };
 };
 
 
 static int stm32_pwm_set_breakinput(struct stm32_pwm *priv,
 static int stm32_pwm_set_breakinput(struct stm32_pwm *priv,
@@ -334,6 +349,7 @@ static int stm32_pwm_probe(struct platform_device *pdev)
 	if (!priv)
 	if (!priv)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
+	mutex_init(&priv->lock);
 	priv->regmap = ddata->regmap;
 	priv->regmap = ddata->regmap;
 	priv->clk = ddata->clk;
 	priv->clk = ddata->clk;
 	priv->max_arr = ddata->max_arr;
 	priv->max_arr = ddata->max_arr;