Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...

diff --combined arch/arm/mach-ns9xxx/irq.c
index 36e5835,bfd906b..ca85d24
--- 1/arch/arm/mach-ns9xxx/irq.c
--- 2/arch/arm/mach-ns9xxx/irq.c
+++ b/arch/arm/mach-ns9xxx/irq.c
@@@ -19,17 -19,12 +19,17 @@@
  
  #include "generic.h"
  
 +/* simple interrupt prio table: prio(x) < prio(y) <=> x < y */
 +#define irq2prio(i) (i)
 +#define prio2irq(p) (p)
 +
  static void ns9xxx_mask_irq(unsigned int irq)
  {
        /* XXX: better use cpp symbols */
 -      u32 ic = __raw_readl(SYS_IC(irq / 4));
 -      ic &= ~(1 << (7 + 8 * (3 - (irq & 3))));
 -      __raw_writel(ic, SYS_IC(irq / 4));
 +      int prio = irq2prio(irq);
 +      u32 ic = __raw_readl(SYS_IC(prio / 4));
 +      ic &= ~(1 << (7 + 8 * (3 - (prio & 3))));
 +      __raw_writel(ic, SYS_IC(prio / 4));
  }
  
  static void ns9xxx_ack_irq(unsigned int irq)
@@@ -46,10 -41,9 +46,10 @@@ static void ns9xxx_maskack_irq(unsigne
  static void ns9xxx_unmask_irq(unsigned int irq)
  {
        /* XXX: better use cpp symbols */
 -      u32 ic = __raw_readl(SYS_IC(irq / 4));
 -      ic |= 1 << (7 + 8 * (3 - (irq & 3)));
 -      __raw_writel(ic, SYS_IC(irq / 4));
 +      int prio = irq2prio(irq);
 +      u32 ic = __raw_readl(SYS_IC(prio / 4));
 +      ic |= 1 << (7 + 8 * (3 - (prio & 3)));
 +      __raw_writel(ic, SYS_IC(prio / 4));
  }
  
  static struct irq_chip ns9xxx_chip = {
@@@ -62,7 -56,7 +62,7 @@@
  #if 0
  #define handle_irq handle_level_irq
  #else
- void handle_prio_irq(unsigned int irq, struct irq_desc *desc)
+ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)
  {
        unsigned int cpu = smp_processor_id();
        struct irqaction *action;
@@@ -70,27 -64,35 +70,35 @@@
  
        spin_lock(&desc->lock);
  
-       if (unlikely(desc->status & IRQ_INPROGRESS))
-               goto out_unlock;
+       BUG_ON(desc->status & IRQ_INPROGRESS);
  
        desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
        kstat_cpu(cpu).irqs[irq]++;
  
        action = desc->action;
        if (unlikely(!action || (desc->status & IRQ_DISABLED)))
-               goto out_unlock;
+               goto out_mask;
  
        desc->status |= IRQ_INPROGRESS;
        spin_unlock(&desc->lock);
  
        action_ret = handle_IRQ_event(irq, action);
  
+       /* XXX: There is no direct way to access noirqdebug, so check
+        * unconditionally for spurious irqs...
+        * Maybe this function should go to kernel/irq/chip.c? */
+       note_interrupt(irq, desc, action_ret);
+ 
        spin_lock(&desc->lock);
        desc->status &= ~IRQ_INPROGRESS;
-       if (!(desc->status & IRQ_DISABLED) && desc->chip->ack)
-               desc->chip->ack(irq);
  
- out_unlock:
+       if (desc->status & IRQ_DISABLED)
+ out_mask:
+               desc->chip->mask(irq);
+ 
+       /* ack unconditionally to unmask lower prio irqs */
+       desc->chip->ack(irq);
+ 
        spin_unlock(&desc->lock);
  }
  #define handle_irq handle_prio_irq
@@@ -102,14 -104,14 +110,14 @@@ void __init ns9xxx_init_irq(void
  
        /* disable all IRQs */
        for (i = 0; i < 8; ++i)
 -              __raw_writel((4 * i) << 24 | (4 * i + 1) << 16 |
 -                              (4 * i + 2) << 8 | (4 * i + 3), SYS_IC(i));
 +              __raw_writel(prio2irq(4 * i) << 24 |
 +                              prio2irq(4 * i + 1) << 16 |
 +                              prio2irq(4 * i + 2) << 8 |
 +                              prio2irq(4 * i + 3),
 +                              SYS_IC(i));
  
 -      /* simple interrupt prio table:
 -       * prio(x) < prio(y) <=> x < y
 -       */
        for (i = 0; i < 32; ++i)
 -              __raw_writel(i, SYS_IVA(i));
 +              __raw_writel(prio2irq(i), SYS_IVA(i));
  
        for (i = 0; i <= 31; ++i) {
                set_irq_chip(i, &ns9xxx_chip);