Skip to content

Commit

Permalink
genirq: Add chip flag for restricting cpu_on/offline calls
Browse files Browse the repository at this point in the history
Add a flag which indicates that the on/offline callback should only be
called on enabled interrupts.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Mar 27, 2011
1 parent 0fdb4b2 commit b3d4223
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
3 changes: 3 additions & 0 deletions include/linux/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
10 changes: 6 additions & 4 deletions kernel/irq/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b3d4223

Please sign in to comment.