Skip to contentSkip to conversation

pwm: imx: don't reprogram PWMSAR if PWM is disabled

PATCH In review Dmitry Eremin-Solenikov 5 participants 6 messages Jul 23, 2014 – Aug 25, 2014

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

PATCH 1/1 pwm: imx: don't reprogram PWMSAR if PWM is disabled

From: Dmitry Eremin-Solenikov <[email protected]>

Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM.

---
 drivers/pwm/pwm-imx.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pwm/pwm-imx.c +8 -3
index c735127..79c2b24 100644
@@ -46,6 +46,7 @@ struct imx_chip {
 	struct clk	*clk_ipg;
 
 	void __iomem	*mmio_base;
+	unsigned long	duty_cycles;
 
 	struct pwm_chip	chip;
 
@@ -105,7 +106,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 {
 	struct imx_chip *imx = to_imx_chip(chip);
 	unsigned long long c;
-	unsigned long period_cycles, duty_cycles, prescale;
+	unsigned long period_cycles, prescale;
 	u32 cr;
 
 	c = clk_get_rate(imx->clk_per);
@@ -118,7 +119,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 	period_cycles /= prescale;
 	c = (unsigned long long)period_cycles * duty_ns;
 	do_div(c, period_ns);
-	duty_cycles = c;
+	imx->duty_cycles = c;
 
 	/*
 	 * according to imx pwm RM, the real period value should be
@@ -134,7 +135,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 
 	period_cycles -= 2;
 
-	writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
+	if (test_bit(PWMF_ENABLED, &pwm->flags))
+		writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
 	writel(period_cycles, imx->mmio_base + MX3_PWMPR);
 
 	cr = readl(imx->mmio_base + MX3_PWMCR);
@@ -157,6 +159,9 @@ static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable)
 	struct imx_chip *imx = to_imx_chip(chip);
 	u32 val;
 
+	if (enable)
+		writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
+
 	val = readl(imx->mmio_base + MX3_PWMCR);
 
 	if (enable)
Signature · 1 line
1.9.3
#1 lore raw
Quoted 6 lines · Dmitry Eremin-Solenikov

From: Dmitry Eremin-Solenikov <[email protected]>

Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM.

What about this patch?

Quoted 59 lines
---
 drivers/pwm/pwm-imx.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pwm/pwm-imx.c +8 -4
index c735127..79c2b24 100644
@@ -46,6 +46,7 @@ struct imx_chip {
        struct clk      *clk_ipg;
 
        void __iomem    *mmio_base;
+       unsigned long   duty_cycles;
 
        struct pwm_chip chip;
 
@@ -105,7 +106,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 {
        struct imx_chip *imx = to_imx_chip(chip);
        unsigned long long c;
-       unsigned long period_cycles, duty_cycles, prescale;
+       unsigned long period_cycles, prescale;
        u32 cr;
 
        c = clk_get_rate(imx->clk_per);
@@ -118,7 +119,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
        period_cycles /= prescale;
        c = (unsigned long long)period_cycles * duty_ns;
        do_div(c, period_ns);
-       duty_cycles = c;
+       imx->duty_cycles = c;
 
        /*
         * according to imx pwm RM, the real period value should be
@@ -134,7 +135,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 
        period_cycles -= 2;
 
-       writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
+       if (test_bit(PWMF_ENABLED, &pwm->flags))
+               writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
        writel(period_cycles, imx->mmio_base + MX3_PWMPR);
 
        cr = readl(imx->mmio_base + MX3_PWMCR);
@@ -157,6 +159,9 @@ static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable)
        struct imx_chip *imx = to_imx_chip(chip);
        u32 val;
 
+       if (enable)
+               writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
+
        val = readl(imx->mmio_base + MX3_PWMCR);
 
        if (enable)
--

1.9.3

#2 lore raw
Quoted 10 lines · Dmitry Eremin-Solenikov
Quoted 6 lines · Dmitry Eremin-Solenikov

From: Dmitry Eremin-Solenikov <[email protected]>

Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM.

What about this patch?

For the reference: the issue with the FIFO can be easily demonstrated on i.MX6 with the help of pwm-backlight. Steps to reproduce:

1) Disable backlight: echo 1 > /sys/class/..../bl_power
2) Change config several times:
echo 1 > /sys/class/.../brightness
echo 2 > /sys/class/.../brightness
echo 3 > /sys/class/.../brightness
echo 4 > /sys/class/.../brightness
echo 7 > /sys/class/.../brightness

3) Reenable backlight and pwm:
echo 0 > /sys/class/.../bl_power

At this point you get PWMSAR = 0, because of FIFO overflow (can be verified by reading PWM status register).

Signature · 2 lines
With best wishes
Dmitry
#3 lore raw
In reply to Dmitry Eremin-Solenikov
Quoted 10 lines · Dmitry Eremin-Solenikov
Quoted 6 lines · Dmitry Eremin-Solenikov

From: Dmitry Eremin-Solenikov <[email protected]>

Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM.

What about this patch?

Copy Liu Ying who seems to have a patch [1] addressing the same problem?

Shawn

[1] http://thread.gmane.org/gmane.linux.pwm/837/focus=836

Quoted 60 lines
Quoted 60 lines
---
 drivers/pwm/pwm-imx.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pwm/pwm-imx.c +8 -4
index c735127..79c2b24 100644
@@ -46,6 +46,7 @@ struct imx_chip {
        struct clk      *clk_ipg;
 
        void __iomem    *mmio_base;
+       unsigned long   duty_cycles;
 
        struct pwm_chip chip;
 
@@ -105,7 +106,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 {
        struct imx_chip *imx = to_imx_chip(chip);
        unsigned long long c;
-       unsigned long period_cycles, duty_cycles, prescale;
+       unsigned long period_cycles, prescale;
        u32 cr;
 
        c = clk_get_rate(imx->clk_per);
@@ -118,7 +119,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
        period_cycles /= prescale;
        c = (unsigned long long)period_cycles * duty_ns;
        do_div(c, period_ns);
-       duty_cycles = c;
+       imx->duty_cycles = c;
 
        /*
         * according to imx pwm RM, the real period value should be
@@ -134,7 +135,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 
        period_cycles -= 2;
 
-       writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
+       if (test_bit(PWMF_ENABLED, &pwm->flags))
+               writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
        writel(period_cycles, imx->mmio_base + MX3_PWMPR);
 
        cr = readl(imx->mmio_base + MX3_PWMCR);
@@ -157,6 +159,9 @@ static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable)
        struct imx_chip *imx = to_imx_chip(chip);
        u32 val;
 
+       if (enable)
+               writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
+
        val = readl(imx->mmio_base + MX3_PWMCR);
 
        if (enable)
--

1.9.3

#4 lore raw
Quoted 5 lines · Shawn Guo
Quoted 4 lines · Dmitry Eremin-Solenikov
Quoted 2 lines · Dmitry Eremin-Solenikov

From: Dmitry Eremin-Solenikov <[email protected]>

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM.

What about this patch?

Copy Liu Ying who seems to have a patch [1] addressing the same problem?

Yes, my patch may address the same problem. And, my patch may cache the last duty cycle as well when the PWM is disabled. The difference is that my patch caches it in the register PWMSAR instead of a variable.

Regards,

Liu Ying

Quoted 64 lines

Shawn

[1] http://thread.gmane.org/gmane.linux.pwm/837/focus=836

Quoted 60 lines
Quoted 60 lines
---
  drivers/pwm/pwm-imx.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pwm/pwm-imx.c +8 -4
index c735127..79c2b24 100644
@@ -46,6 +46,7 @@ struct imx_chip {
         struct clk      *clk_ipg;
 
         void __iomem    *mmio_base;
+       unsigned long   duty_cycles;
 
         struct pwm_chip chip;
 
@@ -105,7 +106,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
  {
         struct imx_chip *imx = to_imx_chip(chip);
         unsigned long long c;
-       unsigned long period_cycles, duty_cycles, prescale;
+       unsigned long period_cycles, prescale;
         u32 cr;
 
         c = clk_get_rate(imx->clk_per);
@@ -118,7 +119,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
         period_cycles /= prescale;
         c = (unsigned long long)period_cycles * duty_ns;
         do_div(c, period_ns);
-       duty_cycles = c;
+       imx->duty_cycles = c;
 
         /*
          * according to imx pwm RM, the real period value should be
@@ -134,7 +135,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
 
         period_cycles -= 2;
 
-       writel(duty_cycles, imx->mmio_base + MX3_PWMSAR);
+       if (test_bit(PWMF_ENABLED, &pwm->flags))
+               writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
         writel(period_cycles, imx->mmio_base + MX3_PWMPR);
 
         cr = readl(imx->mmio_base + MX3_PWMCR);
@@ -157,6 +159,9 @@ static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable)
         struct imx_chip *imx = to_imx_chip(chip);
         u32 val;
 
+       if (enable)
+               writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR);
+
         val = readl(imx->mmio_base + MX3_PWMCR);
 
         if (enable)
--

1.9.3

#5 lore raw
Quoted 11 lines · Liu Ying
Quoted 10 lines · Shawn Guo
Quoted 9 lines · Dmitry Eremin-Solenikov
Quoted 6 lines · Dmitry Eremin-Solenikov

From: Dmitry Eremin-Solenikov <[email protected]>

Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

What about this patch?

Copy Liu Ying who seems to have a patch [1] addressing the same problem?

Yes, my patch may address the same problem. And, my patch may cache the last duty cycle as well when the PWM is disabled. The difference is that my patch caches it in the register PWMSAR instead of a variable.

Dmitry,

I've just pushed Liu's patch that might fix this problem. Can you give it a quick spin to see if it fixes the issue that you're seeing? It's in the for-next branch of the PWM tree[0].

Thanks,
Thierry

[0]: git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git