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: [PATCH 1/5] PM / sleep: Mechanism for aborting system suspends unconditionally
Date: Tue, 05 Aug 2014 17:24:11 +0200 [thread overview]
Message-ID: <2110414.zVMoE3FRqa@vostro.rjw.lan> (raw)
In-Reply-To: <3321219.itH23ZEDt4@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
It sometimes may be necessary to abort a system suspend in
progress or wake up the system from suspend-to-idle even if the
pm_wakeup_event()/pm_stay_awake() mechanism is not enabled.
For this purpose, introduce a new global variable abort_suspend and
make pm_wakeup_pending() check its value. Also add routines for
manipulating that variable.
This is going to be used in subsequent changes.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/base/power/wakeup.c | 20 ++++++++++++++++++++
include/linux/suspend.h | 3 +++
kernel/power/process.c | 1 +
3 files changed, 24 insertions(+)
Index: linux-pm/include/linux/suspend.h
===================================================================
--- linux-pm.orig/include/linux/suspend.h
+++ linux-pm/include/linux/suspend.h
@@ -371,6 +371,8 @@ extern int unregister_pm_notifier(struct
extern bool events_check_enabled;
extern bool pm_wakeup_pending(void);
+extern void pm_system_wakeup(void);
+extern void pm_wakeup_clear(void);
extern bool pm_get_wakeup_count(unsigned int *count, bool block);
extern bool pm_save_wakeup_count(unsigned int count);
extern void pm_wakep_autosleep_enabled(bool set);
@@ -418,6 +420,7 @@ static inline int unregister_pm_notifier
#define pm_notifier(fn, pri) do { (void)(fn); } while (0)
static inline bool pm_wakeup_pending(void) { return false; }
+static inline void pm_system_wakeup(void) {}
static inline void lock_system_sleep(void) {}
static inline void unlock_system_sleep(void) {}
Index: linux-pm/drivers/base/power/wakeup.c
===================================================================
--- linux-pm.orig/drivers/base/power/wakeup.c
+++ linux-pm/drivers/base/power/wakeup.c
@@ -691,6 +691,8 @@ void pm_print_active_wakeup_sources(void
}
EXPORT_SYMBOL_GPL(pm_print_active_wakeup_sources);
+static bool abort_suspend;
+
/**
* pm_wakeup_pending - Check if power transition in progress should be aborted.
*
@@ -712,6 +714,7 @@ bool pm_wakeup_pending(void)
ret = (cnt != saved_count || inpr > 0);
events_check_enabled = !ret;
}
+ ret = ret || abort_suspend;
spin_unlock_irqrestore(&events_lock, flags);
if (ret) {
@@ -722,6 +725,23 @@ bool pm_wakeup_pending(void)
return ret;
}
+void pm_system_wakeup(void)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&events_lock, flags);
+ abort_suspend = true;
+ spin_unlock_irqrestore(&events_lock, flags);
+ freeze_wake();
+}
+
+void pm_wakeup_clear(void)
+{
+ spin_lock_irq(&events_lock);
+ abort_suspend = false;
+ spin_unlock_irq(&events_lock);
+}
+
/**
* pm_get_wakeup_count - Read the number of registered wakeup events.
* @count: Address to store the value at.
Index: linux-pm/kernel/power/process.c
===================================================================
--- linux-pm.orig/kernel/power/process.c
+++ linux-pm/kernel/power/process.c
@@ -129,6 +129,7 @@ int freeze_processes(void)
if (!pm_freezing)
atomic_inc(&system_freezing_cnt);
+ pm_wakeup_clear();
printk("Freezing user space processes ... ");
pm_freezing = true;
error = try_to_freeze_tasks(true);
next prev parent reply other threads:[~2014-08-05 15:11 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 ` Rafael J. Wysocki [this message]
2014-08-05 23:29 ` [Update][PATCH 1/5] PM / sleep: Mechanism for aborting system suspends unconditionally 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 ` [Update][PATCH " Rafael J. Wysocki
2014-08-09 0:28 ` 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=2110414.zVMoE3FRqa@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).