Skip to contentSkip to conversation

Atmel-PWM: Fixed the PWM channel enable/disable issue which will cause the PWM output stop working after reenable. THe PWM channel status register is read to ensure the PWM channel is really enabled or disabled.

PATCH In review robert yang 2 participants 2 messages Oct 1, 2014 – Jun 12, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Atmel-PWM: Fixed the PWM channel enable/disable issue which will cause the PWM output stop working after reenable. THe PWM channel status register is read to ensure the PWM channel is really enabled or disabled.

From: ryang <[email protected]>

---
 drivers/pwm/pwm-atmel.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pwm/pwm-atmel.c +8 -2
index 6e700a5..bab933a 100644
@@ -237,7 +237,10 @@ static int atmel_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 	}
 
 	atmel_pwm_writel(atmel_pwm, PWM_ENA, 1 << pwm->hwpwm);
-
+	while (!(atmel_pwm_readl(atmel_pwm, PWM_SR) & (1 << pwm->hwpwm))) {
+		atmel_pwm_writel(atmel_pwm, PWM_ENA, 1 << pwm->hwpwm);
+		cpu_relax();
+	}
 	return 0;
 }
 
@@ -246,7 +249,10 @@ static void atmel_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	struct atmel_pwm_chip *atmel_pwm = to_atmel_pwm_chip(chip);
 
 	atmel_pwm_writel(atmel_pwm, PWM_DIS, 1 << pwm->hwpwm);
-
+	while (atmel_pwm_readl(atmel_pwm, PWM_SR) & (1 << pwm->hwpwm)) {
+		atmel_pwm_writel(atmel_pwm, PWM_DIS, 1 << pwm->hwpwm);
+		cpu_relax();
+	}
 	clk_disable(atmel_pwm->clk);
 }
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 6 lines · robert yang

From: ryang <[email protected]>

---
 drivers/pwm/pwm-atmel.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Seems like I never got around to review this. Sorry for that.

First, you need to change the commit subject and message. The first line should be a short description of what the patch does, something like this:

pwm: atmel: Ensure channel is enabled or disabled

Followed by a more verbose description of the change. What I don't understand here is under what circumstances it can happen that the channel isn't getting enabled. Is this because some error happened and therefore the register needs to be written again? Or is it just that we need to wait for some time for the PWM to become enabled and we use the PWM enable register for that?

drivers/pwm/pwm-atmel.c static int atmel_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) · line 243

Quoted 13 lines
drivers/pwm/pwm-atmel.c +4 -1
index 6e700a5..bab933a 100644
@@ -237,7 +237,10 @@ static int atmel_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 	}
 
 	atmel_pwm_writel(atmel_pwm, PWM_ENA, 1 << pwm->hwpwm);
-
+	while (!(atmel_pwm_readl(atmel_pwm, PWM_SR) & (1 << pwm->hwpwm))) {
+		atmel_pwm_writel(atmel_pwm, PWM_ENA, 1 << pwm->hwpwm);
+		cpu_relax();
+	}

So this indicates that the PWM_ENA register is used to enable multiple PWM channels. Given that there is a PWM_DIS register too, I suspect that this is a write-only register, so writing zeroes to an enable bit doesn't actually cause the corresponding PWM to be disabled. That would have been a nice explanation for why the original code could break.

Quoted 5 lines
drivers/pwm/pwm-atmel.c +0 -0
 	return 0;
 }
 
@@ -246,7 +249,10 @@ static void atmel_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	struct atmel_pwm_chip *atmel_pwm = to_atmel_pwm_chip(chip);

drivers/pwm/pwm-atmel.c static void atmel_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) · line 258

Quoted 10 lines
drivers/pwm/pwm-atmel.c +4 -1
 
 	atmel_pwm_writel(atmel_pwm, PWM_DIS, 1 << pwm->hwpwm);
-
+	while (atmel_pwm_readl(atmel_pwm, PWM_SR) & (1 << pwm->hwpwm)) {
+		atmel_pwm_writel(atmel_pwm, PWM_DIS, 1 << pwm->hwpwm);
+		cpu_relax();
+	}
 	clk_disable(atmel_pwm->clk);
 }
 

Same here. I don't really understand why this change is necessary. Maybe you can provide a more detailed description of the error you're seeing. Also adding Nicolas to Cc, perhaps he can help find out what the issue is with the current code.

Thierry