lkml.org 
[lkml]   [2012]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 145/187] ACPI / PM: Make acpi_pm_device_sleep_state() follow the specification
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: "Rafael J. Wysocki" <rjw@sisk.pl>

    commit dbe9a2edd17d843d80faf2b99f20a691c1853418 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/sleep.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/acpi/sleep.c
    +++ b/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';



    \
     
     \ /
      Last update: 2012-07-13 02:41    [W:4.087 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site