From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrey Rahmatullin <wrar@wrar.name>
Cc: ACPI Devel Mailing List <linux-acpi@vger.kernel.org>,
linux-pm@lists.linux-foundation.org,
Steven Rostedt <rostedt@goodmis.org>
Subject: [RFT][PATCH 1/4] ACPI / PM: Make acpi_pm_device_sleep_state() follow the specification
Date: Sat, 26 May 2012 23:19:33 +0200 [thread overview]
Message-ID: <201205262319.33464.rjw@sisk.pl> (raw)
In-Reply-To: <201205262316.30096.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
The comparison between the system sleep state being entered
and the lowest system sleep state the given device may wake up
from in acpi_pm_device_sleep_state() is reversed, because the
specification (ACPI 5.0) says that for wakeup to work:
"The sleeping state being entered must be less than or equal to the
power state declared in element 1 of the _PRW object."
In other words, the state returned by _PRW is the deepest
(lowest-power) system sleep state the device is capable of waking up
the system from.
Moreover, acpi_pm_device_sleep_state() also should check if the
wakeup capability is supported through ACPI, because in principle it
may be done via native PCIe PME, for example, in which case _SxW
should not be evaluated.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/sleep.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux/drivers/acpi/sleep.c
===================================================================
--- linux.orig/drivers/acpi/sleep.c
+++ linux/drivers/acpi/sleep.c
@@ -732,8 +732,8 @@ int acpi_pm_device_sleep_state(struct de
* can wake the system. _S0W may be valid, too.
*/
if (acpi_target_sleep_state == ACPI_STATE_S0 ||
- (device_may_wakeup(dev) &&
- adev->wakeup.sleep_state <= acpi_target_sleep_state)) {
+ (device_may_wakeup(dev) && adev->wakeup.flags.valid &&
+ adev->wakeup.sleep_state >= acpi_target_sleep_state)) {
acpi_status status;
acpi_method[3] = 'W';
next prev parent reply other threads:[~2012-05-26 21:19 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.44L0.1205252157430.24286-100000@saphir.localdomain>
[not found] ` <1338005001.13348.279.camel@gandalf.stny.rr.com>
[not found] ` <201205262227.47442.rjw@sisk.pl>
2012-05-26 21:16 ` [RFT] PCI changes related to wakeup (was: Re: ehci_hcd related S3 lockup on ASUS laptops, again) Rafael J. Wysocki
2012-05-26 21:19 ` Rafael J. Wysocki [this message]
2012-05-26 21:20 ` [RFT][PATCH 2/4] PCI / PM: Make platform choose target low-power states of more devices Rafael J. Wysocki
2012-05-26 21:21 ` [RFT][PATCH 3/4] ACPI / PM: Shorten variable name in acpi_pm_device_sleep_state() Rafael J. Wysocki
2012-05-26 21:21 ` [RFT][PATCH 4/4] ACPI / PM: Fix interactions between _SxD and _SxW Rafael J. Wysocki
2012-05-26 21:47 ` [RFT] PCI changes related to wakeup (was: Re: ehci_hcd related S3 lockup on ASUS laptops, again) Andrey Rahmatullin
2012-05-26 22:06 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Rafael J. Wysocki
2012-05-26 22:36 ` [RFT] PCI changes related to wakeup (was: " Andrey Rahmatullin
2012-05-26 22:40 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Alan Stern
2012-05-26 22:59 ` [RFT] PCI changes related to wakeup (was: " Rafael J. Wysocki
2012-05-29 14:23 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Alan Stern
2012-05-29 17:29 ` Rafael J. Wysocki
2012-05-29 18:50 ` Alan Stern
2012-05-29 19:16 ` Rafael J. Wysocki
2012-05-31 21:07 ` Alan Stern
2012-05-31 21:29 ` Rafael J. Wysocki
2012-06-01 15:13 ` Alan Stern
2012-06-01 15:50 ` Steven Rostedt
2012-06-01 15:59 ` [RFT] PCI changes related to wakeup (was: " Alan Stern
2012-06-01 17:01 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Steven Rostedt
2012-06-01 17:17 ` [RFT] PCI changes related to wakeup (was: " Alan Stern
2012-06-01 17:23 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Steven Rostedt
2012-06-01 16:01 ` [RFT] PCI changes related to wakeup (was: " Andrey Rahmatullin
2012-06-01 16:33 ` Alan Stern
2012-05-31 22:02 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Dâniel Fraga
2012-06-01 14:55 ` Alan Stern
2012-05-31 22:25 ` Andrey Rahmatullin
2012-06-13 9:22 ` Rafael J. Wysocki
2012-06-13 14:21 ` [RFT] PCI changes related to wakeup (was: " Alan Stern
2012-05-27 16:41 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Alan Stern
2012-05-27 21:17 ` Andrey Rahmatullin
2012-05-28 20:13 ` [RFT] PCI changes related to wakeup (was: " Rafael J. Wysocki
2012-05-29 7:48 ` Andrey Rahmatullin
2012-05-29 17:30 ` [RFT] PCI changes related to wakeup (was: Re: [linux-pm] " Rafael J. Wysocki
2012-05-29 22:39 ` [RFT] PCI changes related to wakeup (was: " Steven Rostedt
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=201205262319.33464.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=rostedt@goodmis.org \
--cc=wrar@wrar.name \
/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).