From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758707Ab2DYDGl (ORCPT ); Tue, 24 Apr 2012 23:06:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49007 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758072Ab2DYDGi (ORCPT ); Tue, 24 Apr 2012 23:06:38 -0400 From: NeilBrown To: Tony Lindgren , Russell King , Samuel Ortiz , Thomas Gleixner , "Rafael J. Wysocki" Date: Wed, 25 Apr 2012 13:05:24 +1000 Subject: [PATCH 2/3] IRQ: allow check_wakeup_irqs to notice level-triggered interrupts. Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, NeilBrown Message-ID: <20120425030524.7832.85239.stgit@notabene.brown> In-Reply-To: <20120425025637.7832.14013.stgit@notabene.brown> References: <20120425025637.7832.14013.stgit@notabene.brown> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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; } /* From mboxrd@z Thu Jan 1 00:00:00 1970 From: neilb@suse.de (NeilBrown) Date: Wed, 25 Apr 2012 13:05:24 +1000 Subject: [PATCH 2/3] IRQ: allow check_wakeup_irqs to notice level-triggered interrupts. In-Reply-To: <20120425025637.7832.14013.stgit@notabene.brown> References: <20120425025637.7832.14013.stgit@notabene.brown> Message-ID: <20120425030524.7832.85239.stgit@notabene.brown> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- 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; } /*