2 files changed, 9 insertions, 4 deletions

diff --git a/include/linux/irq.h b/include/linux/irq.h
index c2a0c1929690..76e948fa88f8 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -348,11 +348,14 @@ struct irq_chip {
  * IRQCHIP_SET_TYPE_MASKED:     Mask before calling chip.irq_set_type()
  * IRQCHIP_EOI_IF_HANDLED:      Only issue irq_eoi() when irq was handled
  * IRQCHIP_MASK_ON_SUSPEND:     Mask non wake irqs in the suspend path
+ * IRQCHIP_ONOFFLINE_ENABLED:   Only call irq_on/off_line callbacks
+ *                              when irq enabled
  */
 enum {
         IRQCHIP_SET_TYPE_MASKED         = (1 <<  0),
         IRQCHIP_EOI_IF_HANDLED          = (1 <<  1),
         IRQCHIP_MASK_ON_SUSPEND         = (1 <<  2),
+        IRQCHIP_ONOFFLINE_ENABLED       = (1 <<  3),
 };
 
 /* This include will go away once we isolated irq_desc usage to core code */
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 44b16a1ecd9a..9283d3300ea9 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -718,8 +718,9 @@ void irq_cpu_online(void)
                 raw_spin_lock_irqsave(&desc->lock, flags);
 
                 chip = irq_data_get_irq_chip(&desc->irq_data);
-
-                if (chip && chip->irq_cpu_online)
+                if (chip && chip->irq_cpu_online &&
+                    (!(chip->flags & IRQCHIP_ONOFFLINE_ENABLED) ||
+                     !(desc->istate & IRQS_DISABLED)))
                         chip->irq_cpu_online(&desc->irq_data);
 
                 raw_spin_unlock_irqrestore(&desc->lock, flags);
@@ -747,8 +748,9 @@ void irq_cpu_offline(void)
                 raw_spin_lock_irqsave(&desc->lock, flags);
 
                 chip = irq_data_get_irq_chip(&desc->irq_data);
-
-                if (chip && chip->irq_cpu_offline)
+                if (chip && chip->irq_cpu_offline &&
+                    (!(chip->flags & IRQCHIP_ONOFFLINE_ENABLED) ||
+                     !(desc->istate & IRQS_DISABLED)))
                         chip->irq_cpu_offline(&desc->irq_data);
 
                 raw_spin_unlock_irqrestore(&desc->lock, flags);