ACPI / PM: Add more run-time wake-up fields

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>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

3 files changed, 31 insertions, 11 deletions

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 09ca3ce7a051..f53fbe307c9d 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -425,6 +425,7 @@ static int acpi_button_add(struct acpi_device *device)
                 acpi_enable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number,
                                 ACPI_GPE_TYPE_WAKE_RUN);
+                device->wakeup.run_wake_count++;
                 device->wakeup.state.enabled = 1;
         }
 
@@ -448,6 +449,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
                 acpi_disable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number,
                                 ACPI_GPE_TYPE_WAKE_RUN);
+                device->wakeup.run_wake_count--;
                 device->wakeup.state.enabled = 0;
         }
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 3e009674f333..7491a52ad97a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -741,19 +741,39 @@ acpi_bus_extract_wakeup_device_power_package(struct acpi_device *device,
         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_flags(struct acpi_device *device)
 
         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_flags(struct acpi_device *device)
                 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;
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 6783986c7469..4b9d339a6e28 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -110,7 +110,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_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                 ACPI_GPE_TYPE_WAKE);