]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
irq: Warn when shared interrupts do not match on NO_SUSPEND
authorPeter Zijlstra <peterz@infradead.org>
Thu, 24 Jul 2014 13:39:21 +0000 (15:39 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 24 Jul 2014 15:32:56 +0000 (17:32 +0200)
When suspend_device_irqs() iterates all descriptors, its pointless if
one has NO_SUSPEND set while another has not.

Validate on request_irq() that NO_SUSPEND state maches for SHARED
interrupts.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/20140724133921.GY6758@twins.programming.kicks-ass.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/irq/manage.c

index 88657d7bc9dd28768a9ade6076d7cb44e87ee631..27a1fe028afb70bb49936e58d0d0385fb4b6bfd8 100644 (file)
@@ -1077,9 +1077,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
                 * set the trigger type must match. Also all must
                 * agree on ONESHOT.
                 */
+
+#define IRQF_MISMATCH \
+       (IRQF_TRIGGER_MASK | IRQF_ONESHOT | IRQF_NO_SUSPEND)
+
                if (!((old->flags & new->flags) & IRQF_SHARED) ||
-                   ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) ||
-                   ((old->flags ^ new->flags) & IRQF_ONESHOT))
+                   ((old->flags ^ new->flags) & IRQF_MISMATCH))
                        goto mismatch;
 
                /* All handlers must agree on per-cpuness */