From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org,
Linux PM list <linux-pm@vger.kernel.org>,
Dmitry Torokhov <dtor@google.com>
Subject: [Update][PATCH 3/5] irq / PM: Make wakeup interrupts wake up from suspend-to-idle
Date: Fri, 08 Aug 2014 03:58:02 +0200 [thread overview]
Message-ID: <1925225.kgb6kA80iC@vostro.rjw.lan> (raw)
In-Reply-To: <1811897.nanFq2OCTN@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Make IRQs enabled for system wakeup via enable_irq_wake() wake up
the system from suspend-to-idle.
For this purpose, introduce a new routine for enabling and disabling
wakeup interrupts, set_wakeup_irqs(), and make freeze_enter() call it
to enable them before starting the suspend-to-idle loop and to
disable them after that loop has been terminated.
When enabling an IRQ which is not a shared one, that routine
replaces its original handler with a stub one always returning
IRQ_NONE. When disabling it, set_wakeup_irqs() restores the
original handler for it. This way, IRQ_NONE is returned for all
of the wakeup interrupts during suspend-to-idle and that triggers
the abort-suspend-or-wakeup condition in note_interrupt() causing
the system to wake up.
To avoid losing wakeup events, make note_interrupt() mark wakeup
interrupts as pending before triggering wakeup for irqs_suspended
set.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
When I was working on the doc (that I'm going to send shortly), it
occured to me that it actually would be better to always return
IRQ_NONE from interrupt handlers for wakeup interrupts when
irqs_suspended is set - and mark them as pending to avoid losing
wakeup events. That way they'll work uniformly, even if someone is
insane enough to use enable_irq_wake() on an IRQF_NO_SUSPEND IRQ.
Rafael
---
include/linux/interrupt.h | 1 +
kernel/irq/pm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
kernel/irq/spurious.c | 6 +++++-
kernel/power/suspend.c | 3 +++
4 files changed, 54 insertions(+), 1 deletion(-)
Index: linux-pm/include/linux/interrupt.h
===================================================================
--- linux-pm.orig/include/linux/interrupt.h
+++ linux-pm/include/linux/interrupt.h
@@ -197,6 +197,7 @@ extern void irq_wake_thread(unsigned int
/* The following three functions are for the core kernel use only. */
extern void suspend_device_irqs(void);
extern void resume_device_irqs(void);
+extern void set_wakeup_irqs(bool enable);
#ifdef CONFIG_PM_SLEEP
extern int check_wakeup_irqs(void);
#else
Index: linux-pm/kernel/irq/pm.c
===================================================================
--- linux-pm.orig/kernel/irq/pm.c
+++ linux-pm/kernel/irq/pm.c
@@ -130,3 +130,48 @@ int check_wakeup_irqs(void)
return 0;
}
+
+static irqreturn_t irq_pm_empty_handler(int irq, void *dev_id)
+{
+ return IRQ_NONE;
+}
+
+void set_wakeup_irqs(bool enable)
+{
+ struct irq_desc *desc;
+ int irq;
+
+ for_each_irq_desc(irq, desc) {
+ struct irqaction *action = desc->action;
+ unsigned long flags;
+
+ raw_spin_lock_irqsave(&desc->lock, flags);
+
+ if (action && irqd_is_wakeup_set(&desc->irq_data) &&
+ !desc->skip_suspend) {
+ if (enable) {
+ /*
+ * Replace handlers for not shared interrupts.
+ * Shared ones have wrapper handlers already.
+ */
+ if (!action->next) {
+ action->s_handler = action->handler;
+ action->handler = irq_pm_empty_handler;
+ }
+ desc->istate &= ~IRQS_SUSPENDED;
+ __enable_irq(desc, irq, false);
+ } else {
+ if (!(desc->istate & IRQS_SUSPENDED)) {
+ __disable_irq(desc, irq, false);
+ desc->istate |= IRQS_SUSPENDED;
+ }
+ if (action->handler == irq_pm_empty_handler) {
+ action->handler = action->s_handler;
+ action->s_handler = NULL;
+ }
+ }
+ }
+
+ raw_spin_unlock_irqrestore(&desc->lock, flags);
+ }
+}
Index: linux-pm/kernel/power/suspend.c
===================================================================
--- linux-pm.orig/kernel/power/suspend.c
+++ linux-pm/kernel/power/suspend.c
@@ -12,6 +12,7 @@
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/cpuidle.h>
@@ -55,7 +56,9 @@ static void freeze_enter(void)
{
cpuidle_use_deepest_state(true);
cpuidle_resume();
+ set_wakeup_irqs(true);
wait_event(suspend_freeze_wait_head, suspend_freeze_wake);
+ set_wakeup_irqs(false);
cpuidle_pause();
cpuidle_use_deepest_state(false);
}
Index: linux-pm/kernel/irq/spurious.c
===================================================================
--- linux-pm.orig/kernel/irq/spurious.c
+++ linux-pm/kernel/irq/spurious.c
@@ -277,7 +277,11 @@ void note_interrupt(unsigned int irq, st
irqreturn_t action_ret)
{
if (unlikely(irqs_suspended && action_ret == IRQ_NONE)) {
- pr_err("IRQ %d: Unhandled while suspended\n", irq);
+ if (irqd_is_wakeup_set(&desc->irq_data))
+ desc->istate |= IRQS_PENDING;
+ else
+ pr_err("IRQ %d: Unhandled while suspended\n", irq);
+
desc->istate |= IRQS_SUSPENDED;
desc->depth++;
irq_disable(desc);
next prev parent reply other threads:[~2014-08-08 1:39 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 21:26 [RFC][PATCH] irq: Rework IRQF_NO_SUSPENDED Peter Zijlstra
2014-07-24 22:02 ` Rafael J. Wysocki
2014-07-24 23:10 ` Rafael J. Wysocki
2014-07-25 5:58 ` Peter Zijlstra
2014-07-29 19:20 ` Brian Norris
2014-07-29 19:28 ` Peter Zijlstra
2014-07-29 20:41 ` Brian Norris
2014-07-25 9:27 ` Thomas Gleixner
2014-07-25 12:49 ` Rafael J. Wysocki
2014-07-25 13:55 ` Thomas Gleixner
2014-07-25 9:40 ` Thomas Gleixner
2014-07-25 12:40 ` Peter Zijlstra
2014-07-25 13:25 ` Peter Zijlstra
2014-07-25 17:03 ` Rafael J. Wysocki
2014-07-25 16:58 ` Peter Zijlstra
2014-07-25 21:00 ` Thomas Gleixner
2014-07-25 22:25 ` Rafael J. Wysocki
2014-07-25 23:07 ` Rafael J. Wysocki
2014-07-26 11:49 ` Rafael J. Wysocki
2014-07-26 11:53 ` Rafael J. Wysocki
2014-07-28 6:49 ` Peter Zijlstra
2014-07-28 12:33 ` Thomas Gleixner
2014-07-28 13:04 ` Peter Zijlstra
2014-07-28 21:53 ` Rafael J. Wysocki
2014-07-28 23:01 ` Rafael J. Wysocki
2014-07-29 12:46 ` Thomas Gleixner
2014-07-29 13:33 ` Rafael J. Wysocki
2014-07-30 21:46 ` [PATCH 0/3] irq / PM: wakeup interrupt interface for drivers (was: Re: [RFC][PATCH] irq: Rework IRQF_NO_SUSPENDED) Rafael J. Wysocki
2014-07-30 21:51 ` [PATCH 1/3] irq / PM: New driver interface for wakeup interrupts Rafael J. Wysocki
2014-07-30 22:56 ` Thomas Gleixner
2014-07-31 0:12 ` Thomas Gleixner
2014-07-31 2:14 ` Rafael J. Wysocki
2014-07-31 10:44 ` Thomas Gleixner
2014-07-31 18:36 ` Rafael J. Wysocki
2014-07-31 20:12 ` Alan Stern
2014-07-31 21:04 ` Rafael J. Wysocki
2014-07-31 23:41 ` Thomas Gleixner
2014-08-01 0:51 ` Rafael J. Wysocki
2014-08-01 14:41 ` Alan Stern
2014-07-31 22:16 ` Thomas Gleixner
2014-08-01 0:08 ` Rafael J. Wysocki
2014-08-01 1:24 ` Rafael J. Wysocki
2014-08-01 9:40 ` [PATCH 1/3] irq / PM: New driver interface for wakeup interruptsn Thomas Gleixner
2014-08-01 13:45 ` Rafael J. Wysocki
2014-08-01 13:43 ` Thomas Gleixner
2014-08-01 14:29 ` Rafael J. Wysocki
2014-08-02 1:31 ` Rafael J. Wysocki
2014-08-03 13:42 ` Rafael J. Wysocki
2014-08-04 3:38 ` Rafael J. Wysocki
2014-08-05 15:22 ` [PATCH 0/5] irq / PM: Shared IRQs vs IRQF_NO_SUSPEND and suspend-to-idle wakeup Rafael J. Wysocki
2014-08-05 15:24 ` [PATCH 1/5] PM / sleep: Mechanism for aborting system suspends unconditionally Rafael J. Wysocki
2014-08-05 23:29 ` [Update][PATCH " Rafael J. Wysocki
2014-08-05 15:25 ` [PATCH 2/5] irq / PM: Fix IRQF_NO_SUSPEND problem with shared interrupts Rafael J. Wysocki
2014-08-05 15:26 ` [PATCH 3/5] irq / PM: Make wakeup interrupts wake up from suspend-to-idle Rafael J. Wysocki
2014-08-08 1:58 ` Rafael J. Wysocki [this message]
2014-08-09 0:28 ` [Update][PATCH " Rafael J. Wysocki
2014-08-05 15:27 ` [PATCH 4/5] x86 / PM: Set IRQCHIP_SKIP_SET_WAKE for IOAPIC IRQ chip objects Rafael J. Wysocki
2014-08-05 15:28 ` [PATCH 5/5] PCI / PM: Make PCIe PME interrupts wake up from suspend-to-idle Rafael J. Wysocki
2014-08-05 16:12 ` [PATCH 0/5] irq / PM: Shared IRQs vs IRQF_NO_SUSPEND and suspend-to-idle wakeup Peter Zijlstra
2014-08-08 2:09 ` Rafael J. Wysocki
2014-07-31 22:54 ` [PATCH 1/3] irq / PM: New driver interface for wakeup interrupts Thomas Gleixner
2014-07-30 21:51 ` [PATCH 2/3] PCI / PM: Make PCIe PME interrupts wake up from "freeze" sleep state Rafael J. Wysocki
2014-07-30 21:52 ` [PATCH 3/3] gpio-keys / PM: use enable/disable_device_irq_wake() Rafael J. Wysocki
2014-07-28 21:27 ` [RFC][PATCH] irq: Rework IRQF_NO_SUSPENDED Rafael J. Wysocki
2014-07-27 15:53 ` Rafael J. Wysocki
2014-07-27 22:00 ` [PATCH, v2] Rafael J. Wysocki
2014-07-28 12:11 ` Thomas Gleixner
2014-07-28 21:17 ` [PATCH, v3] irq / PM: Fix IRQF_NO_SUSPEND problem with shared interrupts (was: Re: [PATCH, v2]) Rafael J. Wysocki
2014-07-29 7:28 ` [PATCH, v4] irq / PM: Fix IRQF_NO_SUSPEND problem with shared interrupts Rafael J. Wysocki
2014-07-29 13:46 ` [PATCH, v5] " Rafael J. Wysocki
2014-07-30 0:54 ` [PATCH, v6] " Rafael J. Wysocki
2014-07-25 12:47 ` [RFC][PATCH] irq: Rework IRQF_NO_SUSPENDED Rafael J. Wysocki
2014-07-25 13:22 ` Peter Zijlstra
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=1925225.kgb6kA80iC@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=dtor@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).