Commit 23812b9d authored May 22, 2012 by Ning Jiang Committed by Thomas Gleixner May 24, 2012

genirq: Add IRQS_PENDING for nested and simple irq



Every interrupt which is an active wakeup source needs the ability to
abort suspend if there is a pending irq. Right now only edge and level
irqs can do that.

            |
       +---------+
       |   INTC  |
       +---------+
               | GPIO_IRQ
            +------------+
            |  gpio-exp  |
            +------------+
              |        |
         GPIO0_IRQ  GPIO1_IRQ

In the above diagram, gpio expander has irq number GPIO_IRQ, it is
connected with two sub GPIO pins, GPIO0 and GPIO1.

During suspend, we set IRQF_NO_SUSPEND for GPIO_IRQ so that gpio
expander driver can handle the sub irq GPIO0_IRQ and GPIO1_IRQ, and
these two irqs themselves can further be handled by simple or nested
irq in some drivers(typically gpio and mfd driver). If they are used
as wakeup sources during suspend, we want them to be able to abort
suspend too.

Setting IRQS_PENDING flag in handle_nested_irq() and handle_simple_irq()
when the irq is disabled allows check_wakeup_irqs() to identify such
irqs as source for aborting suspend.

Signed-off-by: Ning Jiang <ning.n.jiang@gmail.com>
Cc: rjw@sisk.pl
Link: http://lkml.kernel.org/r/CAH3Oq6T905%2B3fkF43NAMMFvJvq7dsk_so6T2vQ8ZJrA5xiU3YA@mail.gmail.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent f9369910

kernel/irq/chip.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -275,8 +275,10 @@ void handle_nested_irq(unsigned int irq)
	kstat_incr_irqs_this_cpu(irq, desc);		kstat_incr_irqs_this_cpu(irq, desc);

	action = desc->action;		action = desc->action;
	if (unlikely(!action \|\| irqd_irq_disabled(&desc->irq_data)))		if (unlikely(!action \|\| irqd_irq_disabled(&desc->irq_data))) {
			desc->istate \|= IRQS_PENDING;
	goto out_unlock;		goto out_unlock;
			}

	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);		irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
	raw_spin_unlock_irq(&desc->lock);		raw_spin_unlock_irq(&desc->lock);
	@@ -324,8 +326,10 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
	desc->istate &= ~(IRQS_REPLAY \| IRQS_WAITING);		desc->istate &= ~(IRQS_REPLAY \| IRQS_WAITING);
	kstat_incr_irqs_this_cpu(irq, desc);		kstat_incr_irqs_this_cpu(irq, desc);

	if (unlikely(!desc->action \|\| irqd_irq_disabled(&desc->irq_data)))		if (unlikely(!desc->action \|\| irqd_irq_disabled(&desc->irq_data))) {
			desc->istate \|= IRQS_PENDING;
	goto out_unlock;		goto out_unlock;
			}

	handle_irq_event(desc);		handle_irq_event(desc);

Admin message