Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

genirq: Move MASK_ON_SUSPEND handling into suspend_device_irqs()

Browse Source 
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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Thomas Gleixner 2014-08-28 16:49:43 +02:00 committed by Rafael J. Wysocki
parent 5417de2223
commit 092fadd59b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/irq/pm.c
View File

@ -56,6 +56,15 @@ static void suspend_device_irq(struct irq_desc *desc, int irq)
desc->istate |= IRQS_SUSPENDED; desc->istate |= IRQS_SUSPENDED;
__disable_irq(desc, irq); __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 (irqd_is_wakeup_set(&desc->irq_data)) {
if (desc->depth == 1 && desc->istate & IRQS_PENDING) if (desc->depth == 1 && desc->istate & IRQS_PENDING)
return -EBUSY; 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; return 0;