Skip to contentSkip to conversation

irq: Always clear pending flag in check_irq_resend

PATCH New Colin Cross 1 participant 1 message Jun 13, 2011 IRQ

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irq: Always clear pending flag in check_irq_resend

If an interrupt occurs while the irq is masked, the irq is marked as pending. For a level triggered interrupt, the pending flag is only cleared when the interrupt is handled. If the interrupt is never handled because the irq is deasserted before being enabled it will stay pending, and suspend may be blocked by check_wakeup_irqs.

Change check_irq_resend to always clear the pending flag, including for level interrupts.

---
 kernel/irq/resend.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
kernel/irq/resend.c +10 -9
index 14dd576..ef60772 100644
@@ -55,17 +55,18 @@ static DECLARE_TASKLET(resend_tasklet, resend_irqs, 0);
  */
 void check_irq_resend(struct irq_desc *desc, unsigned int irq)
 {
-	/*
-	 * We do not resend level type interrupts. Level type
-	 * interrupts are resent by hardware when they are still
-	 * active.
-	 */
-	if (irq_settings_is_level(desc))
-		return;
-	if (desc->istate & IRQS_REPLAY)
-		return;
 	if (desc->istate & IRQS_PENDING) {
 		desc->istate &= ~IRQS_PENDING;
+		/*
+		 * We do not resend level type interrupts. Level type
+		 * interrupts are resent by hardware when they are still
+		 * active.
+		 */
+		if (irq_settings_is_level(desc))
+			return;
+		if (desc->istate & IRQS_REPLAY)
+			return;
+
 		desc->istate |= IRQS_REPLAY;
 
 		if (!desc->irq_data.chip->irq_retrigger ||
Signature · 1 line
1.7.4.1