diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-11-09 08:53:09 +0000 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 11:20:54 -0400 |
| commit | e9a34a2459723a4fed8282dd15964167bbbb6b62 (patch) | |
| tree | 0eb3bab1342a1904d0fa4a12ff034adcd8f3a8ce /include | |
| parent | ba5ebfb8d23f648cf0369233506a58b58ae0925e (diff) | |
genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
commit 9bab0b7fbaceec47d32db51cd9e59c82fb071f5a upstream
This adds a mechanism to resume selected IRQs during syscore_resume
instead of dpm_resume_noirq.
Under Xen we need to resume IRQs associated with IPIs early enough
that the resched IPI is unmasked and we can therefore schedule
ourselves out of the stop_machine where the suspend/resume takes
place.
This issue was introduced by 676dc3cf5bc3 "xen: Use IRQF_FORCE_RESUME".
Back ported to 2.6.32 (which lacks syscore support) by calling the relavant
resume function directly from sysdev_resume).
v2: Fixed non-x86 build errors.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Link: http://lkml.kernel.org/r/1318713254.11016.52.camel@dagon.hellion.org.uk
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[PG: this v2 backport taken from v2.6.32.49 stable, commit 5e87d8ee34e3]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/interrupt.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 953ff1c877eb..aa607048b6d2 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -54,6 +54,8 @@ * irq line disabled until the threaded handler has been run. * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set + * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device + * resume time. */ #define IRQF_DISABLED 0x00000020 #define IRQF_SAMPLE_RANDOM 0x00000040 @@ -66,6 +68,7 @@ #define IRQF_ONESHOT 0x00002000 #define IRQF_NO_SUSPEND 0x00004000 #define IRQF_FORCE_RESUME 0x00008000 +#define IRQF_EARLY_RESUME 0x00020000 #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND) @@ -198,13 +201,16 @@ extern void suspend_device_irqs(void); extern void resume_device_irqs(void); #ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs(void); +extern void irq_pm_syscore_resume(void); #else static inline int check_wakeup_irqs(void) { return 0; } +static inline void irq_pm_syscore_resume(void) { }; #endif #else static inline void suspend_device_irqs(void) { }; static inline void resume_device_irqs(void) { }; static inline int check_wakeup_irqs(void) { return 0; } +static inline void irq_pm_syscore_resume(void) { }; #endif #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS) |