Commit e27b1636 authored Aug 11, 2020 by Guenter Roeck Committed by Thomas Gleixner Aug 12, 2020

genirq/PM: Always unlock IRQ descriptor in rearm_wake_irq()



rearm_wake_irq() does not unlock the irq descriptor if the interrupt
is not suspended or if wakeup is not enabled on it.

Restucture the exit conditions so the unlock is always ensured.

Fixes: 3a79bc63 ("PCI: irq: Introduce rearm_wake_irq()")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200811180001.80203-1-linux@roeck-us.net

parent fb893de3

kernel/irq/pm.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -185,14 +185,18 @@ void rearm_wake_irq(unsigned int irq)
		unsigned long flags;
		struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);

		if (!desc \|\| !(desc->istate & IRQS_SUSPENDED) \|\|
		!irqd_is_wakeup_set(&desc->irq_data))
		if (!desc)
		return;

		if (!(desc->istate & IRQS_SUSPENDED) \|\|
		!irqd_is_wakeup_set(&desc->irq_data))
		goto unlock;

		desc->istate &= ~IRQS_SUSPENDED;
		irqd_set(&desc->irq_data, IRQD_WAKEUP_ARMED);
		__enable_irq(desc);

		unlock:
		irq_put_desc_busunlock(desc, flags);
		}

Admin message