lkml.org 
[lkml]   [2010]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/9] ACPI / PM: Add more run-time wake-up fields (rev. 2)
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Use the run_wake flag to mark all devices for which run-time wake-up
    events may be generated by the platform. Introduce a new wake-up
    flag, always_enabled, for marking devices that should be permanently
    enabled to generate run-time events. Also, introduce a reference
    counter for run-wake devices and a function that will initialize all
    of the run-time wake-up fields for given device.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Len Brown <len.brown@intel.com>
    ---
    drivers/acpi/button.c | 2 ++
    drivers/acpi/scan.c | 37 +++++++++++++++++++++++++++----------
    drivers/acpi/wakeup.c | 3 ++-
    include/acpi/acpi_bus.h | 2 ++
    4 files changed, 33 insertions(+), 11 deletions(-)

    Index: linux-2.6/drivers/acpi/wakeup.c
    ===================================================================
    --- linux-2.6.orig/drivers/acpi/wakeup.c
    +++ linux-2.6/drivers/acpi/wakeup.c
    @@ -106,7 +106,8 @@ int __init acpi_wakeup_device_init(void)
    struct acpi_device,
    wakeup_list);
    /* In case user doesn't load button driver */
    - if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
    + if (!dev->wakeup.flags.always_enabled ||
    + dev->wakeup.state.enabled)
    continue;
    acpi_ref_wakeup_gpe(dev->wakeup.gpe_device,
    dev->wakeup.gpe_number);
    Index: linux-2.6/include/acpi/acpi_bus.h
    ===================================================================
    --- linux-2.6.orig/include/acpi/acpi_bus.h
    +++ linux-2.6/include/acpi/acpi_bus.h
    @@ -242,6 +242,7 @@ struct acpi_device_perf {
    struct acpi_device_wakeup_flags {
    u8 valid:1; /* Can successfully enable wakeup? */
    u8 run_wake:1; /* Run-Wake GPE devices */
    + u8 always_enabled:1; /* Run-wake devices that are always enabled */
    };

    struct acpi_device_wakeup_state {
    @@ -256,6 +257,7 @@ struct acpi_device_wakeup {
    struct acpi_device_wakeup_state state;
    struct acpi_device_wakeup_flags flags;
    int prepare_count;
    + int run_wake_count;
    };

    /* Device */
    Index: linux-2.6/drivers/acpi/button.c
    ===================================================================
    --- linux-2.6.orig/drivers/acpi/button.c
    +++ linux-2.6/drivers/acpi/button.c
    @@ -426,6 +426,7 @@ static int acpi_button_add(struct acpi_d
    device->wakeup.gpe_number);
    acpi_ref_wakeup_gpe(device->wakeup.gpe_device,
    device->wakeup.gpe_number);
    + device->wakeup.run_wake_count++;
    device->wakeup.state.enabled = 1;
    }

    @@ -450,6 +451,7 @@ static int acpi_button_remove(struct acp
    device->wakeup.gpe_number);
    acpi_unref_wakeup_gpe(device->wakeup.gpe_device,
    device->wakeup.gpe_number);
    + device->wakeup.run_wake_count--;
    device->wakeup.state.enabled = 0;
    }

    Index: linux-2.6/drivers/acpi/scan.c
    ===================================================================
    --- linux-2.6.orig/drivers/acpi/scan.c
    +++ linux-2.6/drivers/acpi/scan.c
    @@ -741,19 +741,39 @@ acpi_bus_extract_wakeup_device_power_pac
    return AE_OK;
    }

    -static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
    +static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
    {
    - acpi_status status = 0;
    - struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
    - union acpi_object *package = NULL;
    - int psw_error;
    -
    struct acpi_device_id button_device_ids[] = {
    {"PNP0C0D", 0},
    {"PNP0C0C", 0},
    {"PNP0C0E", 0},
    {"", 0},
    };
    + acpi_status status;
    + acpi_event_status event_status;
    +
    + device->wakeup.run_wake_count = 0;
    +
    + /* Power button, Lid switch always enable wakeup */
    + if (!acpi_match_device_ids(device, button_device_ids)) {
    + device->wakeup.flags.run_wake = 1;
    + device->wakeup.flags.always_enabled = 1;
    + return;
    + }
    +
    + status = acpi_get_gpe_status(NULL, device->wakeup.gpe_number,
    + ACPI_NOT_ISR, &event_status);
    + if (status == AE_OK)
    + device->wakeup.flags.run_wake =
    + !!(event_status & ACPI_EVENT_FLAG_HANDLE);
    +}
    +
    +static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
    +{
    + acpi_status status = 0;
    + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
    + union acpi_object *package = NULL;
    + int psw_error;

    /* _PRW */
    status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer);
    @@ -773,6 +793,7 @@ static int acpi_bus_get_wakeup_device_fl

    device->wakeup.flags.valid = 1;
    device->wakeup.prepare_count = 0;
    + acpi_bus_set_run_wake_flags(device);
    /* Call _PSW/_DSW object to disable its ability to wake the sleeping
    * system for the ACPI device with the _PRW object.
    * The _PSW object is depreciated in ACPI 3.0 and is replaced by _DSW.
    @@ -784,10 +805,6 @@ static int acpi_bus_get_wakeup_device_fl
    ACPI_DEBUG_PRINT((ACPI_DB_INFO,
    "error in _DSW or _PSW evaluation\n"));

    - /* Power button, Lid switch always enable wakeup */
    - if (!acpi_match_device_ids(device, button_device_ids))
    - device->wakeup.flags.run_wake = 1;
    -
    end:
    if (ACPI_FAILURE(status))
    device->flags.wake_capable = 0;


    \
     
     \ /
      Last update: 2010-01-10 15:09    [W:0.051 / U:33.092 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site