From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Alexey Starikovskiy <astarikovskiy@suse.de>,
Len Brown <len.brown@intel.com>
Subject: [PATCH 19/37] ACPI: Hibernate erroneously disabled Suspend wakeup devices
Date: Wed, 10 Oct 2007 01:06:26 -0400 [thread overview]
Message-ID: <1191992804-14965-20-git-send-email-lenb@kernel.org> (raw)
Message-ID: <9b039330808b83acac3597535da26f47ad1862ce.1191992584.git.len.brown@intel.com> (raw)
In-Reply-To: <1191992804-14965-1-git-send-email-lenb@kernel.org>
In-Reply-To: <fd1caaed466de2ee100e250b6c755376eda7ba3b.1191992584.git.len.brown@intel.com>
From: Alexey Starikovskiy <astarikovskiy@suse.de>
S4 suspend to disk will disable GPE's permanently
because acpi_gpe_sleep_prepare() does not have
a counterpart at resume time. Thus, those devices
became unavailable for wakeup from subsequent
S3 suspend-to-ram.
Here acpi_gpe_sleep_prepare() is removed, and upon suspend
acpi_enable_wakeup_device() gets its functionality.
Upon resume, acpi_disable_wakeup_device() restores the state.
https://bugzilla.novell.com/show_bug.cgi?id=292300
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/sleep/main.c | 1 -
drivers/acpi/sleep/sleep.h | 1 -
drivers/acpi/sleep/wakeup.c | 117 +++++++++++++++----------------------------
include/acpi/acpi_bus.h | 1 -
4 files changed, 40 insertions(+), 80 deletions(-)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 2cbb9aa..9426ac1 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -44,7 +44,6 @@ int acpi_sleep_prepare(u32 acpi_state)
ACPI_FLUSH_CPU_CACHE();
acpi_enable_wakeup_device_prep(acpi_state);
#endif
- acpi_gpe_sleep_prepare(acpi_state);
acpi_enter_sleep_state_prep(acpi_state);
return 0;
}
diff --git a/drivers/acpi/sleep/sleep.h b/drivers/acpi/sleep/sleep.h
index ff1f850..a2ea125 100644
--- a/drivers/acpi/sleep/sleep.h
+++ b/drivers/acpi/sleep/sleep.h
@@ -5,6 +5,5 @@ extern int acpi_suspend (u32 state);
extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
extern void acpi_enable_wakeup_device(u8 sleep_state);
extern void acpi_disable_wakeup_device(u8 sleep_state);
-extern void acpi_gpe_sleep_prepare(u32 sleep_state);
extern int acpi_sleep_prepare(u32 acpi_state);
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index 97c27dd..ed8e41b 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -64,36 +64,29 @@ void acpi_enable_wakeup_device(u8 sleep_state)
ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device");
spin_lock(&acpi_device_lock);
list_for_each_safe(node, next, &acpi_wakeup_device_list) {
- struct acpi_device *dev = container_of(node,
- struct acpi_device,
- wakeup_list);
-
+ struct acpi_device *dev =
+ container_of(node, struct acpi_device, wakeup_list);
+ if (!dev->wakeup.flags.valid)
+ continue;
/* If users want to disable run-wake GPE,
* we only disable it for wake and leave it for runtime
*/
- if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
- spin_unlock(&acpi_device_lock);
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_ISR);
- spin_lock(&acpi_device_lock);
+ if (!dev->wakeup.state.enabled ||
+ sleep_state > (u32) dev->wakeup.sleep_state) {
+ if (dev->wakeup.flags.run_wake) {
+ spin_unlock(&acpi_device_lock);
+ /* set_gpe_type will disable GPE, leave it like that */
+ acpi_set_gpe_type(dev->wakeup.gpe_device,
+ dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_RUNTIME);
+ spin_lock(&acpi_device_lock);
+ }
continue;
}
-
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.enabled ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
- continue;
-
spin_unlock(&acpi_device_lock);
- /* run-wake GPE has been enabled */
if (!dev->wakeup.flags.run_wake)
acpi_enable_gpe(dev->wakeup.gpe_device,
dev->wakeup.gpe_number, ACPI_ISR);
- dev->wakeup.state.active = 1;
spin_lock(&acpi_device_lock);
}
spin_unlock(&acpi_device_lock);
@@ -112,26 +105,25 @@ void acpi_disable_wakeup_device(u8 sleep_state)
spin_lock(&acpi_device_lock);
list_for_each_safe(node, next, &acpi_wakeup_device_list) {
- struct acpi_device *dev = container_of(node,
- struct acpi_device,
- wakeup_list);
+ struct acpi_device *dev =
+ container_of(node, struct acpi_device, wakeup_list);
- if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
- spin_unlock(&acpi_device_lock);
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- /* Re-enable it, since set_gpe_type will disable it */
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- spin_lock(&acpi_device_lock);
+ if (!dev->wakeup.flags.valid)
continue;
- }
-
- if (!dev->wakeup.flags.valid ||
- !dev->wakeup.state.active ||
- (sleep_state > (u32) dev->wakeup.sleep_state))
+ if (!dev->wakeup.state.enabled ||
+ sleep_state > (u32) dev->wakeup.sleep_state) {
+ if (dev->wakeup.flags.run_wake) {
+ spin_unlock(&acpi_device_lock);
+ acpi_set_gpe_type(dev->wakeup.gpe_device,
+ dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ /* Re-enable it, since set_gpe_type will disable it */
+ acpi_enable_gpe(dev->wakeup.gpe_device,
+ dev->wakeup.gpe_number, ACPI_NOT_ISR);
+ spin_lock(&acpi_device_lock);
+ }
continue;
+ }
spin_unlock(&acpi_device_lock);
acpi_disable_wakeup_device_power(dev);
@@ -142,7 +134,6 @@ void acpi_disable_wakeup_device(u8 sleep_state)
acpi_clear_gpe(dev->wakeup.gpe_device,
dev->wakeup.gpe_number, ACPI_NOT_ISR);
}
- dev->wakeup.state.active = 0;
spin_lock(&acpi_device_lock);
}
spin_unlock(&acpi_device_lock);
@@ -160,48 +151,20 @@ static int __init acpi_wakeup_device_init(void)
struct acpi_device *dev = container_of(node,
struct acpi_device,
wakeup_list);
-
/* In case user doesn't load button driver */
- if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
- spin_unlock(&acpi_device_lock);
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_WAKE_RUN);
- acpi_enable_gpe(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number, ACPI_NOT_ISR);
- dev->wakeup.state.enabled = 1;
- spin_lock(&acpi_device_lock);
- }
+ if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
+ continue;
+ spin_unlock(&acpi_device_lock);
+ acpi_set_gpe_type(dev->wakeup.gpe_device,
+ dev->wakeup.gpe_number,
+ ACPI_GPE_TYPE_WAKE_RUN);
+ acpi_enable_gpe(dev->wakeup.gpe_device,
+ dev->wakeup.gpe_number, ACPI_NOT_ISR);
+ dev->wakeup.state.enabled = 1;
+ spin_lock(&acpi_device_lock);
}
spin_unlock(&acpi_device_lock);
-
return 0;
}
late_initcall(acpi_wakeup_device_init);
-
-/*
- * Disable all wakeup GPEs before entering requested sleep state.
- * @sleep_state: ACPI state
- * Since acpi_enter_sleep_state() will disable all
- * RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from requested state as RUNTIME.
- */
-void acpi_gpe_sleep_prepare(u32 sleep_state)
-{
- struct list_head *node, *next;
-
- list_for_each_safe(node, next, &acpi_wakeup_device_list) {
- struct acpi_device *dev = container_of(node,
- struct acpi_device,
- wakeup_list);
-
- /* The GPE can wakeup system from this state, don't touch it */
- if ((u32) dev->wakeup.sleep_state >= sleep_state)
- continue;
- /* acpi_set_gpe_type will automatically disable GPE */
- acpi_set_gpe_type(dev->wakeup.gpe_device,
- dev->wakeup.gpe_number,
- ACPI_GPE_TYPE_RUNTIME);
- }
-}
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 86aea44..17500a1 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -264,7 +264,6 @@ struct acpi_device_wakeup_flags {
struct acpi_device_wakeup_state {
u8 enabled:1;
- u8 active:1;
};
struct acpi_device_wakeup {
--
1.5.3.4.206.g58ba4
next prev parent reply other threads:[~2007-10-10 5:06 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-10 5:06 ACPI patch candidates for 2.6.24 merge window Len Brown
2007-10-10 5:06 ` [PATCH 01/37] sony-laptop: old Vaio models contain 2 IO port entries Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 02/37] fujitsu-laptop: create Fujitsu laptop platform specific driver Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 03/37] ACPI: thermal: use round_jiffies when thermal zone polling is enabled Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 04/37] ACPI: Thermal: Drop concurrent thermal checks Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 05/37] ACPI: video: Don't call absent methods Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 06/37] ACPI: VIDEO: Adjust current level to closest available one Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 07/37] ACPI: EC: Drop ECDT-based boot_ec as soon as we find DSDT-based one Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 08/37] sony-laptop/thinkpad-acpi: fix INPUT=n build Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 09/37] acpi_video: kernel build error if !INPUT Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 10/37] ACPI: thinkpad-acpi: make room for more features in tp_features bitfield Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 11/37] ACPI: thinkpad-acpi: issue EV_SYNC after EV_SWITCH Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 12/37] ACPI: thinkpad-acpi: add mutex-based locking to input device event send path Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 13/37] ACPI: thinkpad-acpi: keep track of module state Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 14/37] ACPI: thinkpad-acpi: check version of hot key firmware Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 15/37] ACPI: thinkpad-acpi: dequeue all pending hot key events at once (v2.2) Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 16/37] ACPI: thinkpad-acpi: fix regression on HKEY LID event handling Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 17/37] ACPI: thinkpad-acpi: use a separate platform device for hwmon and name it (v2) Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 18/37] ACPI: thinkpad-acpi: duplicate driver attributes to new hwmon pdrv Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` Len Brown [this message]
2007-10-10 5:06 ` [PATCH 19/37] ACPI: Hibernate erroneously disabled Suspend wakeup devices Len Brown
2007-10-11 10:12 ` Rafael J. Wysocki
2007-10-10 5:06 ` [PATCH 20/37] ACPI: Battery: don't use acpi_extract_package() Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 21/37] ACPI: Battery: simplify update scheme Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 22/37] ACPI: Battery: Misc clean-ups, no functional changes Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 23/37] ACPI: Battery: Add sysfs support Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 24/37] ACPI: Battery: add sysfs alarm Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 25/37] ACPI: Add acpi_bus_generate_event4() function Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 26/37] ACPI: EC: Add new query handler to list head Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 27/37] ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002) Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 28/37] ACPI: SBS: Simplify data structures in SBS Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 29/37] ACPI: SBS: Make SBS reads table-driven Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 30/37] ACPI: SBS: Add support for power_supply class (and sysfs) Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 31/37] ACPI: SBS: Add ACPI_PROCFS around procfs handling code Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 32/37] ACPI: SBS: Add sysfs alarm Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 33/37] ACPI: AC: Add sysfs interface Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 34/37] ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 35/37] ACPI: suppress uninitialized var warning Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 36/37] Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish Len Brown
2007-10-10 5:06 ` Len Brown
2007-10-10 5:06 ` [PATCH 37/37] ACPI: clean up acpi_enter_sleep_state_prep Len Brown
2007-10-10 5:06 ` Len Brown
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=1191992804-14965-20-git-send-email-lenb@kernel.org \
--to=lenb@kernel.org \
--cc=astarikovskiy@suse.de \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
/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.