Commit b3d42232 authored by Thomas Gleixner's avatar Thomas Gleixner

genirq: Add chip flag for restricting cpu_on/offline calls

Add a flag which indicates that the on/offline callback should only be
called on enabled interrupts.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0fdb4b25
...@@ -348,11 +348,14 @@ struct irq_chip { ...@@ -348,11 +348,14 @@ struct irq_chip {
* IRQCHIP_SET_TYPE_MASKED: Mask before calling chip.irq_set_type() * IRQCHIP_SET_TYPE_MASKED: Mask before calling chip.irq_set_type()
* IRQCHIP_EOI_IF_HANDLED: Only issue irq_eoi() when irq was handled * 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_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 { enum {
IRQCHIP_SET_TYPE_MASKED = (1 << 0), IRQCHIP_SET_TYPE_MASKED = (1 << 0),
IRQCHIP_EOI_IF_HANDLED = (1 << 1), IRQCHIP_EOI_IF_HANDLED = (1 << 1),
IRQCHIP_MASK_ON_SUSPEND = (1 << 2), 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 */ /* This include will go away once we isolated irq_desc usage to core code */
......
...@@ -718,8 +718,9 @@ void irq_cpu_online(void) ...@@ -718,8 +718,9 @@ void irq_cpu_online(void)
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
chip = irq_data_get_irq_chip(&desc->irq_data); 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); chip->irq_cpu_online(&desc->irq_data);
raw_spin_unlock_irqrestore(&desc->lock, flags); raw_spin_unlock_irqrestore(&desc->lock, flags);
...@@ -747,8 +748,9 @@ void irq_cpu_offline(void) ...@@ -747,8 +748,9 @@ void irq_cpu_offline(void)
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
chip = irq_data_get_irq_chip(&desc->irq_data); 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); chip->irq_cpu_offline(&desc->irq_data);
raw_spin_unlock_irqrestore(&desc->lock, flags); raw_spin_unlock_irqrestore(&desc->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment