2 files changed, 12 insertions, 1 deletions

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 1695054e8c63..44657197fcb0 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -161,6 +161,7 @@ struct irq_desc {
         unsigned int            wake_depth;     /* nested wake enables */
         unsigned int            irq_count;      /* For detecting broken IRQs */
         unsigned int            irqs_unhandled;
+        unsigned long           last_unhandled; /* Aging timer for unhandled count */
         spinlock_t              lock;
 #ifdef CONFIG_SMP
         cpumask_t               affinity;
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index bd9e272d55e9..32b161972fad 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -172,7 +172,17 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
                     irqreturn_t action_ret)
 {
         if (unlikely(action_ret != IRQ_HANDLED)) {
-                desc->irqs_unhandled++;
+                /*
+                 * If we are seeing only the odd spurious IRQ caused by
+                 * bus asynchronicity then don't eventually trigger an error,
+                 * otherwise the couter becomes a doomsday timer for otherwise
+                 * working systems
+                 */
+                if (jiffies - desc->last_unhandled > HZ/10)
+                        desc->irqs_unhandled = 1;
+                else
+                        desc->irqs_unhandled++;
+                desc->last_unhandled = jiffies;
                 if (unlikely(action_ret != IRQ_NONE))
                         report_bad_irq(irq, desc, action_ret);
         }