Skip to contentSkip to conversation

irq fixes

GIT PULL Ingo Molnar 1 participant 1 message Feb 27, 2012 IRQ

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest irq-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus

HEAD: b4bc724e82e80478cba5fe9825b62e71ddf78757 genirq: Handle pending irqs in irq_startup()

Thanks,

Ingo

------------------>
Thomas Gleixner (2):
genirq: Unmask oneshot irqs when thread was not woken
genirq: Handle pending irqs in irq_startup()

 kernel/irq/autoprobe.c |    4 ++--
 kernel/irq/chip.c      |   42 +++++++++++++++++++++++++++++++++---------
 kernel/irq/internals.h |    2 +-
 kernel/irq/manage.c    |    2 +-
 4 files changed, 37 insertions(+), 13 deletions(-)
kernel/irq/autoprobe.c +2 -2
index 342d8f4..0119b9d 100644
@@ -53,7 +53,7 @@ unsigned long probe_irq_on(void)
 			if (desc->irq_data.chip->irq_set_type)
 				desc->irq_data.chip->irq_set_type(&desc->irq_data,
 							 IRQ_TYPE_PROBE);
-			irq_startup(desc);
+			irq_startup(desc, false);
 		}
 		raw_spin_unlock_irq(&desc->lock);
 	}
@@ -70,7 +70,7 @@ unsigned long probe_irq_on(void)
 		raw_spin_lock_irq(&desc->lock);
 		if (!desc->action && irq_settings_can_probe(desc)) {
 			desc->istate |= IRQS_AUTODETECT | IRQS_WAITING;
-			if (irq_startup(desc))
+			if (irq_startup(desc, false))
 				desc->istate |= IRQS_PENDING;
 		}
 		raw_spin_unlock_irq(&desc->lock);
kernel/irq/chip.c +33 -9

79 lines not on this page · raw message

kernel/irq/internals.h +1 -1
index b795231..40378ff 100644
@@ -67,7 +67,7 @@ extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
 extern void __disable_irq(struct irq_desc *desc, unsigned int irq, bool susp);
 extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume);
 
-extern int irq_startup(struct irq_desc *desc);
+extern int irq_startup(struct irq_desc *desc, bool resend);
 extern void irq_shutdown(struct irq_desc *desc);
 extern void irq_enable(struct irq_desc *desc);
 extern void irq_disable(struct irq_desc *desc);
kernel/irq/manage.c +1 -1
index a9a9dbe..32313c0 100644
@@ -1027,7 +1027,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
 			desc->istate |= IRQS_ONESHOT;
 
 		if (irq_settings_can_autoenable(desc))
-			irq_startup(desc);
+			irq_startup(desc, true);
 		else
 			/* Undo nested disables: */
 			desc->depth = 1;