All of lore.kernel.org
 help / color / mirror / Atom feed
From: NeilBrown <neilb@suse.de>
To: Tony Lindgren <tony@atomide.com>,
	Russell King <linux@arm.linux.org.uk>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	"Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	NeilBrown <neilb@suse.de>
Subject: [PATCH 2/3] IRQ: allow check_wakeup_irqs to notice level-triggered interrupts.
Date: Wed, 25 Apr 2012 13:05:24 +1000	[thread overview]
Message-ID: <20120425030524.7832.85239.stgit@notabene.brown> (raw)
In-Reply-To: <20120425025637.7832.14013.stgit@notabene.brown>

Level triggered interrupts do not cause IRQS_PENDING to be set, so
check_wakeup_irqs ignores them.
They don't need to set IRQS_PENDING as the level stays high which
shows that they must be pending.  However if such an interrupt fired
during late suspend, it will have been masked so the fact that it
is still asserted will not cause the suspend to abort.

So if any wakeup interrupt is masked, unmask it when checking wakeup
irqs.  If the interrupt is asserted, suspend will abort.

Signed-off-by: NeilBrown <neilb@suse.de>
---

 kernel/irq/pm.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 15e53b1..0d26206 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -106,6 +106,12 @@ int check_wakeup_irqs(void)
 		if (irqd_is_wakeup_set(&desc->irq_data)) {
 			if (desc->istate & IRQS_PENDING)
 				return -EBUSY;
+			if (irqd_irq_masked(&desc->irq_data))
+				/* Probably a level interrupt
+				 * which fired recently and was
+				 * masked
+				 */
+				unmask_irq(desc);
 			continue;
 		}
 		/*



WARNING: multiple messages have this Message-ID (diff)
From: neilb@suse.de (NeilBrown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] IRQ: allow check_wakeup_irqs to notice level-triggered interrupts.
Date: Wed, 25 Apr 2012 13:05:24 +1000	[thread overview]
Message-ID: <20120425030524.7832.85239.stgit@notabene.brown> (raw)
In-Reply-To: <20120425025637.7832.14013.stgit@notabene.brown>

Level triggered interrupts do not cause IRQS_PENDING to be set, so
check_wakeup_irqs ignores them.
They don't need to set IRQS_PENDING as the level stays high which
shows that they must be pending.  However if such an interrupt fired
during late suspend, it will have been masked so the fact that it
is still asserted will not cause the suspend to abort.

So if any wakeup interrupt is masked, unmask it when checking wakeup
irqs.  If the interrupt is asserted, suspend will abort.

Signed-off-by: NeilBrown <neilb@suse.de>
---

 kernel/irq/pm.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 15e53b1..0d26206 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -106,6 +106,12 @@ int check_wakeup_irqs(void)
 		if (irqd_is_wakeup_set(&desc->irq_data)) {
 			if (desc->istate & IRQS_PENDING)
 				return -EBUSY;
+			if (irqd_irq_masked(&desc->irq_data))
+				/* Probably a level interrupt
+				 * which fired recently and was
+				 * masked
+				 */
+				unmask_irq(desc);
 			continue;
 		}
 		/*

  parent reply	other threads:[~2012-04-25  3:06 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-25  3:05 [PATCH 0/3] Ensure twl4030 interrupts are lost during suspend NeilBrown
2012-04-25  3:05 ` NeilBrown
2012-04-25  3:05 ` [PATCH 3/3] twl4030: enable wakeup on twl4030 IRQ NeilBrown
2012-04-25  3:05   ` NeilBrown
2012-04-26 20:39   ` Kevin Hilman
2012-04-26 20:39     ` Kevin Hilman
2012-05-09 16:03   ` Samuel Ortiz
2012-05-09 16:03     ` Samuel Ortiz
2012-04-25  3:05 ` [PATCH 1/3] ARM: omap2+: set IRQCHIP_SKIP_SET_WAKE for INTC interrupts NeilBrown
2012-04-25  3:05   ` NeilBrown
2012-04-26 20:08   ` Kevin Hilman
2012-04-26 20:08     ` Kevin Hilman
2012-04-26 20:25     ` Tony Lindgren
2012-04-26 20:25       ` Tony Lindgren
2012-04-26 20:39   ` Kevin Hilman
2012-04-26 20:39     ` Kevin Hilman
2012-04-26 20:50     ` NeilBrown
2012-04-26 20:50       ` NeilBrown
2012-04-27 22:01       ` Kevin Hilman
2012-04-27 22:01         ` Kevin Hilman
2012-04-27  6:20     ` Shilimkar, Santosh
2012-04-27  6:20       ` Shilimkar, Santosh
2012-04-27  6:20       ` Shilimkar, Santosh
2012-04-25  3:05 ` NeilBrown [this message]
2012-04-25  3:05   ` [PATCH 2/3] IRQ: allow check_wakeup_irqs to notice level-triggered interrupts NeilBrown
2012-04-25  8:50   ` Thomas Gleixner
2012-04-25  8:50     ` Thomas Gleixner
2012-04-25  9:39     ` NeilBrown
2012-04-25  9:39       ` NeilBrown
2012-04-25 12:54       ` Thomas Gleixner
2012-04-25 12:54         ` Thomas Gleixner
2012-04-25 21:04         ` NeilBrown
2012-04-25 21:04           ` NeilBrown
2012-05-04  5:12         ` NeilBrown
2012-05-04  5:12           ` NeilBrown
2012-05-04 16:01           ` Thomas Gleixner
2012-05-04 16:01             ` Thomas Gleixner
2012-05-08 20:52             ` NeilBrown
2012-05-08 20:52               ` NeilBrown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120425030524.7832.85239.stgit@notabene.brown \
    --to=neilb@suse.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=rjw@sisk.pl \
    --cc=sameo@linux.intel.com \
    --cc=tglx@linutronix.de \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.