[PATCH] Dove: Attempt to fix PMU/RTC interrupts

[PATCH] Dove: Attempt to fix PMU/RTC interrupts

[Russell King - ARM Linux]

Fix the acknowledgement of PMU interrupts on Dove: some Dove hardware
has not been sensibly designed so that interrupts can be handled in a
race free manner.  The PMU is one such instance.

The pending (aka 'cause') register is a bunch of RW bits, meaning that
these bits can be both cleared and set by software (confirmed on the
Armada-510 on the cubox.)

Hardware sets the appropriate bit when an interrupt is asserted, and
software is required to clear the bits which are to be processed.  If
we write ~(1 << bit), then we end up asserting every other interrupt
except the one we're processing.  So, we need to do a read-modify-write
cycle to clear the asserted bit.

However, any interrupts which occur in the middle of this cycle will
also be written back as zero, which will also clear the new interrupts.

The upshot of this is: there is _no_ way to safely clear down interrupts
in this register (and other similarly behaving interrupt pending
registers on this device.)  The patch below at least stops us creating
new interrupts.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-- 
 arch/arm/mach-dove/irq.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

This should be -rc material - it's a bug; the existing code will cause
an interrupt storm should more than one interrupt in this register be
enabled at the same time.

diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-dove/irq.c
index 9bc97a5..8c861ae 100644
--- a/arch/arm/mach-dove/irq.c
+++ b/arch/arm/mach-dove/irq.c
@@ -45,8 +45,20 @@ static void pmu_irq_ack(struct irq_data *d)
 	int pin = irq_to_pmu(d->irq);
 	u32 u;
 
+	/*
+	 * The PMU mask register is not RW0C: it is RW.  This means that
+	 * the bits take whatever value is written to them; if you write
+	 * a '1', you will set the interrupt.
+	 *
+	 * Unfortunately this means there is NO race free way to clear
+	 * these interrupts.
+	 *
+	 * So, let's structure the code so that the window is as small as
+	 * possible.
+	 */
 	u = ~(1 << (pin & 31));
-	writel(u, PMU_INTERRUPT_CAUSE);
+	u &= readl_relaxed(PMU_INTERRUPT_CAUSE);
+	writel_relaxed(u, PMU_INTERRUPT_CAUSE);
 }
 
 static struct irq_chip pmu_irq_chip = {

[PATCH] Dove: Fix irq_to_pmu()

[Russell King - ARM Linux]

PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
Fix the condition.  (It may have been less likely to occur had the code
been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
to understand notation, and matches the normal way of thinking about
these things.)

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-- 
 arch/arm/mach-dove/include/mach/pm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-dove/include/mach/pm.h b/arch/arm/mach-dove/include/mach/pm.h
index 1c942c0..02a0073 100644
--- a/arch/arm/mach-dove/include/mach/pm.h
+++ b/arch/arm/mach-dove/include/mach/pm.h
@@ -184,7 +184,7 @@ static inline int pmu_to_irq(int pin)
 
 static inline int irq_to_pmu(int irq)
 {
-	if (IRQ_DOVE_PMU_START < irq && irq < NR_IRQS)
+	if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS)
 		return irq - IRQ_DOVE_PMU_START;
 
 	return -EINVAL;

[PATCH] Dove: Fix irq_to_pmu()

[Sergei Shtylyov]

Hello.

On 18-11-2012 20:39, Russell King - ARM Linux wrote:

> PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
> Fix the condition.  (It may have been less likely to occur had the code
> been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
> to understand notation, and matches the normal way of thinking about
> these things.)

> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> --

    Should be "---", or somebody (you?) will have to hand edit the patch when 
applying...

WBR, Sergei

[PATCH] Dove: Fix irq_to_pmu()

[Russell King - ARM Linux]

On Sun, Nov 18, 2012 at 11:00:28PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 18-11-2012 20:39, Russell King - ARM Linux wrote:
>
>> PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
>> Fix the condition.  (It may have been less likely to occur had the code
>> been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
>> to understand notation, and matches the normal way of thinking about
>> these things.)
>
>> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
>> --
>
>    Should be "---", or somebody (you?) will have to hand edit the patch 
> when applying...

Sorry, can never remember that...

[PATCH] Dove: Fix irq_to_pmu()

[Jason Cooper]

On Sun, Nov 18, 2012 at 08:38:15PM +0000, Russell King - ARM Linux wrote:
> On Sun, Nov 18, 2012 at 11:00:28PM +0400, Sergei Shtylyov wrote:
> > Hello.
> >
> > On 18-11-2012 20:39, Russell King - ARM Linux wrote:
> >
> >> PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
> >> Fix the condition.  (It may have been less likely to occur had the code
> >> been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
> >> to understand notation, and matches the normal way of thinking about
> >> these things.)
> >
> >> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> >> --
> >
> >    Should be "---", or somebody (you?) will have to hand edit the patch 
> > when applying...
> 
> Sorry, can never remember that...

No problem, I'll handle it when I pull it in.

thx,

Jason.

[PATCH] Dove: Fix irq_to_pmu()

[Russell King - ARM Linux]

On Sun, Nov 18, 2012 at 04:02:29PM -0500, Jason Cooper wrote:
> On Sun, Nov 18, 2012 at 08:38:15PM +0000, Russell King - ARM Linux wrote:
> > On Sun, Nov 18, 2012 at 11:00:28PM +0400, Sergei Shtylyov wrote:
> > > Hello.
> > >
> > > On 18-11-2012 20:39, Russell King - ARM Linux wrote:
> > >
> > >> PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
> > >> Fix the condition.  (It may have been less likely to occur had the code
> > >> been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
> > >> to understand notation, and matches the normal way of thinking about
> > >> these things.)
> > >
> > >> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > >> --
> > >
> > >    Should be "---", or somebody (you?) will have to hand edit the patch 
> > > when applying...
> > 
> > Sorry, can never remember that...
> 
> No problem, I'll handle it when I pull it in.

And there's yet another bug... this time in the kirkwood audio driver:

static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
{
        struct kirkwood_dma_priv *prdata = dev_id;
        struct kirkwood_dma_data *priv = prdata->data;
        unsigned long mask, status, cause;   
        
        mask = readl(priv->io + KIRKWOOD_INT_MASK);
        status = readl(priv->io + KIRKWOOD_INT_CAUSE) & mask;

        cause = readl(priv->io + KIRKWOOD_ERR_CAUSE);
        if (unlikely(cause)) {
                printk(KERN_WARNING "%s: got err interrupt 0x%lx\n",
                                __func__, cause);
                writel(cause, priv->io + KIRKWOOD_ERR_CAUSE);
                return IRQ_HANDLED;
        }

What happens here if an underrun (0x20) interrupt happens?  Well, the
kernel log looks something like this:

kirkwood_dma_irq: got err interrupt 0x20
kirkwood_dma_irq: got err interrupt 0x20
kirkwood_dma_irq: got err interrupt 0x20
kirkwood_dma_irq: got err interrupt 0x20
kirkwood_dma_irq: got err interrupt 0x20
kirkwood_dma_irq: got err interrupt 0x20
...

and the system spins doing nothing but that message.  It's not because the
interrupt isn't being cleared (it's a sensible write-1-to-clear register).

If you have (frigged) orion_wdt to work, then you'll get a reset after 25s,
otherwise you'll have what appears to be a totally dead system with (due to
the log buffer rewrite) no kernel message output, no interrupts, no nothing.

It's taken a full day to track this bug down...

As for what causes the underrun, that's a different (and as yet unanswered)
question... but without the patch below which turns off the error reporting
after the first (until it's re-opened) DVD quality MPEG2 decoding fails in
less than one minute with ubuntu precise 12.10 userspace with the machine
locking solid... doesn't matter if it's software or hardware decode.

diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index 690260b..26a1d36 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -73,10 +73,12 @@ static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
 	status = readl(priv->io + KIRKWOOD_INT_CAUSE) & mask;
 
 	cause = readl(priv->io + KIRKWOOD_ERR_CAUSE);
+	cause &= readl(priv->io + KIRKWOOD_ERR_MASK);
 	if (unlikely(cause)) {
 		printk(KERN_WARNING "%s: got err interrupt 0x%lx\n",
 				__func__, cause);
 		writel(cause, priv->io + KIRKWOOD_ERR_CAUSE);
+		writel(0, priv->io + KIRKWOOD_ERR_MASK);
 		return IRQ_HANDLED;
 	}
 

Now I'm getting to the point of wondering how well tested any of this
dove/kirkwood/orion code actually is... it all looks rather insanely
fragile to me tonight.

[PATCH] Dove: Fix irq_to_pmu()

[Russell King - ARM Linux]

On Sun, Nov 18, 2012 at 10:31:25PM +0000, Russell King - ARM Linux wrote:
> And there's yet another bug... this time in the kirkwood audio driver:
> 
> static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
> {
>         struct kirkwood_dma_priv *prdata = dev_id;
>         struct kirkwood_dma_data *priv = prdata->data;
>         unsigned long mask, status, cause;   
>         
>         mask = readl(priv->io + KIRKWOOD_INT_MASK);
>         status = readl(priv->io + KIRKWOOD_INT_CAUSE) & mask;
> 
>         cause = readl(priv->io + KIRKWOOD_ERR_CAUSE);
>         if (unlikely(cause)) {
>                 printk(KERN_WARNING "%s: got err interrupt 0x%lx\n",
>                                 __func__, cause);
>                 writel(cause, priv->io + KIRKWOOD_ERR_CAUSE);
>                 return IRQ_HANDLED;
>         }
> 
> What happens here if an underrun (0x20) interrupt happens?  Well, the
> kernel log looks something like this:

Actually, it's _far_ worse.  This interrupt handler is hooked into the
_normal_ I2S IRQ (21) - errors are reported via a separate IRQ (22).

So what happens is a normal IRQ (in INT_CAUSE) gets signalled.  It's at
that point we notice that an error occured... and clear the error,
leaving the normal interrupt set in INT_CAUSE, and return lying that
we'd serviced the interrupt.

The result is... IRQ21 is still pending, and ends up being the higher
priority interrupt, so we service IRQ21 again... and find that the
error cause bit has been set again... and return yet again IRQ_HANDLED
without actually servicing the interrupt...

I think we're far better off ripping out this "error handling".  If we
want to have this, then we should hook the _proper_ error interrupt, and
have some kind of back-off on it (which I think is the right solution).
Or if we merely want to report that an error occurred, then just get rid
of that "return IRQ_HANDLED" there.

kirkwood i2s lockup, was: Re: [PATCH] Dove: Fix irq_to_pmu()

[Jason Cooper]

On Sun, Nov 18, 2012 at 10:31:25PM +0000, Russell King - ARM Linux wrote:
> On Sun, Nov 18, 2012 at 04:02:29PM -0500, Jason Cooper wrote:
> > On Sun, Nov 18, 2012 at 08:38:15PM +0000, Russell King - ARM Linux wrote:
> > > On Sun, Nov 18, 2012 at 11:00:28PM +0400, Sergei Shtylyov wrote:
> > > > Hello.
> > > >
> > > > On 18-11-2012 20:39, Russell King - ARM Linux wrote:
> > > >
> > > >> PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
> > > >> Fix the condition.  (It may have been less likely to occur had the code
> > > >> been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
> > > >> to understand notation, and matches the normal way of thinking about
> > > >> these things.)
> > > >
> > > >> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > > >> --
> > > >
> > > >    Should be "---", or somebody (you?) will have to hand edit the patch 
> > > > when applying...
> > > 
> > > Sorry, can never remember that...
> > 
> > No problem, I'll handle it when I pull it in.
> 
> And there's yet another bug... this time in the kirkwood audio driver:
> 
> static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
> {
>         struct kirkwood_dma_priv *prdata = dev_id;
>         struct kirkwood_dma_data *priv = prdata->data;
>         unsigned long mask, status, cause;   
>         
>         mask = readl(priv->io + KIRKWOOD_INT_MASK);
>         status = readl(priv->io + KIRKWOOD_INT_CAUSE) & mask;
> 
>         cause = readl(priv->io + KIRKWOOD_ERR_CAUSE);
>         if (unlikely(cause)) {
>                 printk(KERN_WARNING "%s: got err interrupt 0x%lx\n",
>                                 __func__, cause);
>                 writel(cause, priv->io + KIRKWOOD_ERR_CAUSE);
>                 return IRQ_HANDLED;
>         }
> 
> What happens here if an underrun (0x20) interrupt happens?  Well, the
> kernel log looks something like this:
> 
> kirkwood_dma_irq: got err interrupt 0x20
> kirkwood_dma_irq: got err interrupt 0x20
> kirkwood_dma_irq: got err interrupt 0x20
> kirkwood_dma_irq: got err interrupt 0x20
> kirkwood_dma_irq: got err interrupt 0x20
> kirkwood_dma_irq: got err interrupt 0x20
> ...
> 
> and the system spins doing nothing but that message.  It's not because the
> interrupt isn't being cleared (it's a sensible write-1-to-clear register).
> 
> If you have (frigged) orion_wdt to work, then you'll get a reset after 25s,
> otherwise you'll have what appears to be a totally dead system with (due to
> the log buffer rewrite) no kernel message output, no interrupts, no nothing.
> 
> It's taken a full day to track this bug down...
> 
> As for what causes the underrun, that's a different (and as yet unanswered)
> question... but without the patch below which turns off the error reporting
> after the first (until it's re-opened) DVD quality MPEG2 decoding fails in
> less than one minute with ubuntu precise 12.10 userspace with the machine
> locking solid... doesn't matter if it's software or hardware decode.
> 
> diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
> index 690260b..26a1d36 100644
> --- a/sound/soc/kirkwood/kirkwood-dma.c
> +++ b/sound/soc/kirkwood/kirkwood-dma.c
> @@ -73,10 +73,12 @@ static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
>  	status = readl(priv->io + KIRKWOOD_INT_CAUSE) & mask;
>  
>  	cause = readl(priv->io + KIRKWOOD_ERR_CAUSE);
> +	cause &= readl(priv->io + KIRKWOOD_ERR_MASK);
>  	if (unlikely(cause)) {
>  		printk(KERN_WARNING "%s: got err interrupt 0x%lx\n",
>  				__func__, cause);
>  		writel(cause, priv->io + KIRKWOOD_ERR_CAUSE);
> +		writel(0, priv->io + KIRKWOOD_ERR_MASK);
>  		return IRQ_HANDLED;
>  	}
>  
> 
> Now I'm getting to the point of wondering how well tested any of this
> dove/kirkwood/orion code actually is... it all looks rather insanely
> fragile to me tonight.

I won't deny that at all, I think the CuBox is the first platform to
actually use the Marvell audio/multimedia code.  Anywho, git blame
points at:

commit f9b95980f87f021f8c69646738929189838ad035
Author: apatard at mandriva.com <apatard@mandriva.com>
Date:   Mon May 31 13:49:14 2010 +0200

    ASoC: kirkwood: Add i2s support

    This patch enables support for the i2s controller available on
    kirkwood platforms

    Signed-off-by: Arnaud Patard <apatard@mandriva.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

which is the original commit adding the driver.  I've added them to the
reply to see if they have any insight.

thx,

Jason.

[PATCH] Dove: Fix irq_to_pmu()

[Jason Cooper]

Russell,

adding relevant folks to the CC:

On Sun, Nov 18, 2012 at 11:08:05PM +0000, Russell King - ARM Linux wrote:
> On Sun, Nov 18, 2012 at 10:31:25PM +0000, Russell King - ARM Linux wrote:
> > And there's yet another bug... this time in the kirkwood audio driver:
> > 
> > static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
> > {
> >         struct kirkwood_dma_priv *prdata = dev_id;
> >         struct kirkwood_dma_data *priv = prdata->data;
> >         unsigned long mask, status, cause;   
> >         
> >         mask = readl(priv->io + KIRKWOOD_INT_MASK);
> >         status = readl(priv->io + KIRKWOOD_INT_CAUSE) & mask;
> > 
> >         cause = readl(priv->io + KIRKWOOD_ERR_CAUSE);
> >         if (unlikely(cause)) {
> >                 printk(KERN_WARNING "%s: got err interrupt 0x%lx\n",
> >                                 __func__, cause);
> >                 writel(cause, priv->io + KIRKWOOD_ERR_CAUSE);
> >                 return IRQ_HANDLED;
> >         }
> > 
> > What happens here if an underrun (0x20) interrupt happens?  Well, the
> > kernel log looks something like this:
> 
> Actually, it's _far_ worse.  This interrupt handler is hooked into the
> _normal_ I2S IRQ (21) - errors are reported via a separate IRQ (22).
> 
> So what happens is a normal IRQ (in INT_CAUSE) gets signalled.  It's at
> that point we notice that an error occured... and clear the error,
> leaving the normal interrupt set in INT_CAUSE, and return lying that
> we'd serviced the interrupt.
> 
> The result is... IRQ21 is still pending, and ends up being the higher
> priority interrupt, so we service IRQ21 again... and find that the
> error cause bit has been set again... and return yet again IRQ_HANDLED
> without actually servicing the interrupt...
> 
> I think we're far better off ripping out this "error handling".  If we
> want to have this, then we should hook the _proper_ error interrupt, and
> have some kind of back-off on it (which I think is the right solution).
> Or if we merely want to report that an error occurred, then just get rid
> of that "return IRQ_HANDLED" there.

thx,

Jason.

[PATCH] Dove: Fix irq_to_pmu()

[Andrew Lunn]

On Sun, Nov 18, 2012 at 10:31:25PM +0000, Russell King - ARM Linux wrote:

> Now I'm getting to the point of wondering how well tested any of this
> dove/kirkwood/orion code actually is... it all looks rather insanely
> fragile to me tonight.

Hi Russell

I would say, anything a NAS box typically uses, is well tested. When
you get away from that use case, expect problems.

    Andrew

[PATCH] Dove: Attempt to fix PMU/RTC interrupts

[Andrew Lunn]

On Sun, Nov 18, 2012 at 04:29:44PM +0000, Russell King - ARM Linux wrote:
> Fix the acknowledgement of PMU interrupts on Dove: some Dove hardware
> has not been sensibly designed so that interrupts can be handled in a
> race free manner.  The PMU is one such instance.

Hi Russel

I checked with Marvell. They confirmed there is no race free way to
clear these interrupts :-(

   Andrew

[PATCH] Dove: Attempt to fix PMU/RTC interrupts

[Russell King - ARM Linux]

On Wed, Nov 21, 2012 at 04:59:46PM +0100, Andrew Lunn wrote:
> On Sun, Nov 18, 2012 at 04:29:44PM +0000, Russell King - ARM Linux wrote:
> > Fix the acknowledgement of PMU interrupts on Dove: some Dove hardware
> > has not been sensibly designed so that interrupts can be handled in a
> > race free manner.  The PMU is one such instance.
> 
> Hi Russel
> 
> I checked with Marvell. They confirmed there is no race free way to
> clear these interrupts :-(

That's what I thought given how the hardware behaves and what the
documentation says.  So the best we can do is to ensure that the window
between reading and writing is as small as possible.  Not perfect but
it's the best we can do with the buggy hardware we have. :(

[PATCH] Dove: Attempt to fix PMU/RTC interrupts

[Jason Cooper]

On Wed, Nov 21, 2012 at 04:53:53PM +0000, Russell King - ARM Linux wrote:
> On Wed, Nov 21, 2012 at 04:59:46PM +0100, Andrew Lunn wrote:
> > On Sun, Nov 18, 2012 at 04:29:44PM +0000, Russell King - ARM Linux wrote:
> > > Fix the acknowledgement of PMU interrupts on Dove: some Dove hardware
> > > has not been sensibly designed so that interrupts can be handled in a
> > > race free manner.  The PMU is one such instance.
> > 
> > Hi Russel
> > 
> > I checked with Marvell. They confirmed there is no race free way to
> > clear these interrupts :-(
> 
> That's what I thought given how the hardware behaves and what the
> documentation says.  So the best we can do is to ensure that the window
> between reading and writing is as small as possible.  Not perfect but
> it's the best we can do with the buggy hardware we have. :(

Russell,

I'll go ahead and pull this in to mvebu/fixes and flag it for stable.

thx,

Jason.