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

Commit 092fadd5 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Rafael J. Wysocki
Browse files

genirq: Move MASK_ON_SUSPEND handling into suspend_device_irqs() 



There is no reason why we should delay the masking of interrupts whose
interrupt chip requests MASK_ON_SUSPEND to the point where we check
the wakeup interrupts. We can do it right at the point where we mark
the interrupt as suspended.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5417de22

kernel/irq/pm.c

+9 −12
Original line number Diff line number Diff line
@@ -56,6 +56,15 @@ static void suspend_device_irq(struct irq_desc *desc, int irq) 


	desc->istate |= IRQS_SUSPENDED;

	__disable_irq(desc, irq);



	/*

	 * Hardware which has no wakeup source configuration facility

	 * requires that the non wakeup interrupts are masked at the

	 * chip level. The chip implementation indicates that with

	 * IRQCHIP_MASK_ON_SUSPEND.

	 */

	if (irq_desc_get_chip(desc)->flags & IRQCHIP_MASK_ON_SUSPEND)

		mask_irq(desc);

}



/**
@@ -176,19 +185,7 @@ int check_wakeup_irqs(void) 
		if (irqd_is_wakeup_set(&desc->irq_data)) {

			if (desc->depth == 1 && desc->istate & IRQS_PENDING)

				return -EBUSY;

			continue;

		}

		/*

		 * Check the non wakeup interrupts whether they need

		 * to be masked before finally going into suspend

		 * state. That's for hardware which has no wakeup

		 * source configuration facility. The chip

		 * implementation indicates that with

		 * IRQCHIP_MASK_ON_SUSPEND.

		 */

		if (desc->istate & IRQS_SUSPENDED &&

		    irq_desc_get_chip(desc)->flags & IRQCHIP_MASK_ON_SUSPEND)

			mask_irq(desc);

	}



	return 0;