ACPI: Use GPE reference counting to support shared GPEs

ACPI GPEs may map to multiple devices.  The current GPE interface
only provides a mechanism for enabling and disabling GPEs, making
it difficult to change the state of GPEs at runtime without extensive
cooperation between devices.

Add an API to allow devices to indicate whether or not they want
their device's GPE to be enabled for both runtime and wakeup events.

Remove the old GPE type handling entirely, which gets rid of various
quirks, like the implicit disabling with GPE type setting. This
requires a small amount of rework in order to ensure that non-wake
GPEs are enabled by default to preserve existing behaviour.

Based on patches from Matthew Garrett <mjg@redhat.com>.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 8a95e8329df7..09ca3ce7a051 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -422,11 +422,9 @@ static int acpi_button_add(struct acpi_device *device)
 
         if (device->wakeup.flags.valid) {
                 /* Button's GPE is run-wake GPE */
-                acpi_set_gpe_type(device->wakeup.gpe_device,
-                                  device->wakeup.gpe_number,
-                                  ACPI_GPE_TYPE_WAKE_RUN);
                 acpi_enable_gpe(device->wakeup.gpe_device,
-                                device->wakeup.gpe_number);
+                                device->wakeup.gpe_number,
+                                ACPI_GPE_TYPE_WAKE_RUN);
                 device->wakeup.state.enabled = 1;
         }
 
@@ -446,6 +444,13 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 {
         struct acpi_button *button = acpi_driver_data(device);
 
+        if (device->wakeup.flags.valid) {
+                acpi_disable_gpe(device->wakeup.gpe_device,
+                                device->wakeup.gpe_number,
+                                ACPI_GPE_TYPE_WAKE_RUN);
+                device->wakeup.state.enabled = 0;
+        }
+
         acpi_button_remove_fs(device);
         input_unregister_device(button->input);
         kfree(button);