Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5613570b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

x86 / PM: Set IRQCHIP_SKIP_SET_WAKE for IOAPIC IRQ chip objects 



Set the IRQCHIP_SKIP_SET_WAKE for IOAPIC IRQ chip objects so that
interrupts from them can work as wakeup interrupts for suspend-to-idle.

After this change, running enable_irq_wake() on one of the IRQs in
question will succeed and IRQD_WAKEUP_STATE will be set for it, so
all of the suspend-to-idle wakeup mechanics introduced previously
will work for it automatically.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9ce7a258

arch/x86/kernel/apic/io_apic.c

+5 −0
Original line number Diff line number Diff line
@@ -2623,6 +2623,7 @@ static struct irq_chip ioapic_chip __read_mostly = { 
	.irq_eoi		= ack_apic_level,

	.irq_set_affinity	= native_ioapic_set_affinity,

	.irq_retrigger		= ioapic_retrigger_irq,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



static inline void init_IO_APIC_traps(void)
@@ -3173,6 +3174,7 @@ static struct irq_chip msi_chip = { 
	.irq_ack		= ack_apic_edge,

	.irq_set_affinity	= msi_set_affinity,

	.irq_retrigger		= ioapic_retrigger_irq,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
@@ -3271,6 +3273,7 @@ static struct irq_chip dmar_msi_type = { 
	.irq_ack		= ack_apic_edge,

	.irq_set_affinity	= dmar_msi_set_affinity,

	.irq_retrigger		= ioapic_retrigger_irq,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



int arch_setup_dmar_msi(unsigned int irq)
@@ -3321,6 +3324,7 @@ static struct irq_chip hpet_msi_type = { 
	.irq_ack = ack_apic_edge,

	.irq_set_affinity = hpet_msi_set_affinity,

	.irq_retrigger = ioapic_retrigger_irq,

	.flags = IRQCHIP_SKIP_SET_WAKE,

};



int default_setup_hpet_msi(unsigned int irq, unsigned int id)
@@ -3384,6 +3388,7 @@ static struct irq_chip ht_irq_chip = { 
	.irq_ack		= ack_apic_edge,

	.irq_set_affinity	= ht_set_affinity,

	.irq_retrigger		= ioapic_retrigger_irq,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)