PCI ACPI: Rework PCI handling of wake-up

[linux-2.6-omap-h63xx.git] / drivers / acpi / sleep / wakeup.c

diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index af1dbabaf0b1d299277fe65727eed95778751c1d..38655eb132dcca3a42ac2db56f2daf79d3b10286 100644 (file)
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -17,7 +17,6 @@ ACPI_MODULE_NAME("wakeup_devices")
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
 
-#ifdef CONFIG_ACPI_SLEEP
 /**
  * acpi_enable_wakeup_device_prep - prepare wakeup devices
  *     @sleep_state:   ACPI state
@@ -43,7 +42,7 @@ void acpi_enable_wakeup_device_prep(u8 sleep_state)
                        continue;
 
                spin_unlock(&acpi_device_lock);
-               acpi_enable_wakeup_device_power(dev);
+               acpi_enable_wakeup_device_power(dev, sleep_state);
                spin_lock(&acpi_device_lock);
        }
        spin_unlock(&acpi_device_lock);
@@ -65,36 +64,31 @@ void acpi_enable_wakeup_device(u8 sleep_state)
        ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device");
        spin_lock(&acpi_device_lock);
        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev = container_of(node,
-                                                      struct acpi_device,
-                                                      wakeup_list);
+               struct acpi_device *dev =
+                       container_of(node, struct acpi_device, wakeup_list);
+
+               if (!dev->wakeup.flags.valid)
+                       continue;
 
                /* If users want to disable run-wake GPE,
                 * we only disable it for wake and leave it for runtime
                 */
-               if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                       spin_unlock(&acpi_device_lock);
-                       acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                         dev->wakeup.gpe_number,
-                                         ACPI_GPE_TYPE_RUNTIME);
-                       /* Re-enable it, since set_gpe_type will disable it */
-                       acpi_enable_gpe(dev->wakeup.gpe_device,
-                                       dev->wakeup.gpe_number, ACPI_ISR);
-                       spin_lock(&acpi_device_lock);
+               if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared)
+                   || sleep_state > (u32) dev->wakeup.sleep_state) {
+                       if (dev->wakeup.flags.run_wake) {
+                               spin_unlock(&acpi_device_lock);
+                               /* set_gpe_type will disable GPE, leave it like that */
+                               acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                                 dev->wakeup.gpe_number,
+                                                 ACPI_GPE_TYPE_RUNTIME);
+                               spin_lock(&acpi_device_lock);
+                       }
                        continue;
                }
-
-               if (!dev->wakeup.flags.valid ||
-                   !dev->wakeup.state.enabled ||
-                   (sleep_state > (u32) dev->wakeup.sleep_state))
-                       continue;
-
                spin_unlock(&acpi_device_lock);
-               /* run-wake GPE has been enabled */
                if (!dev->wakeup.flags.run_wake)
                        acpi_enable_gpe(dev->wakeup.gpe_device,
                                        dev->wakeup.gpe_number, ACPI_ISR);
-               dev->wakeup.state.active = 1;
                spin_lock(&acpi_device_lock);
        }
        spin_unlock(&acpi_device_lock);
@@ -113,26 +107,26 @@ void acpi_disable_wakeup_device(u8 sleep_state)
 
        spin_lock(&acpi_device_lock);
        list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev = container_of(node,
-                                                      struct acpi_device,
-                                                      wakeup_list);
+               struct acpi_device *dev =
+                       container_of(node, struct acpi_device, wakeup_list);
 
-               if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                       spin_unlock(&acpi_device_lock);
-                       acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                         dev->wakeup.gpe_number,
-                                         ACPI_GPE_TYPE_WAKE_RUN);
-                       /* Re-enable it, since set_gpe_type will disable it */
-                       acpi_enable_gpe(dev->wakeup.gpe_device,
-                                       dev->wakeup.gpe_number, ACPI_NOT_ISR);
-                       spin_lock(&acpi_device_lock);
+               if (!dev->wakeup.flags.valid)
                        continue;
-               }
 
-               if (!dev->wakeup.flags.valid ||
-                   !dev->wakeup.state.active ||
-                   (sleep_state > (u32) dev->wakeup.sleep_state))
+               if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared)
+                   || sleep_state > (u32) dev->wakeup.sleep_state) {
+                       if (dev->wakeup.flags.run_wake) {
+                               spin_unlock(&acpi_device_lock);
+                               acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                                 dev->wakeup.gpe_number,
+                                                 ACPI_GPE_TYPE_WAKE_RUN);
+                               /* Re-enable it, since set_gpe_type will disable it */
+                               acpi_enable_gpe(dev->wakeup.gpe_device,
+                                               dev->wakeup.gpe_number, ACPI_NOT_ISR);
+                               spin_lock(&acpi_device_lock);
+                       }
                        continue;
+               }
 
                spin_unlock(&acpi_device_lock);
                acpi_disable_wakeup_device_power(dev);
@@ -143,7 +137,6 @@ void acpi_disable_wakeup_device(u8 sleep_state)
                        acpi_clear_gpe(dev->wakeup.gpe_device,
                                       dev->wakeup.gpe_number, ACPI_NOT_ISR);
                }
-               dev->wakeup.state.active = 0;
                spin_lock(&acpi_device_lock);
        }
        spin_unlock(&acpi_device_lock);
@@ -161,49 +154,20 @@ static int __init acpi_wakeup_device_init(void)
                struct acpi_device *dev = container_of(node,
                                                       struct acpi_device,
                                                       wakeup_list);
-
                /* In case user doesn't load button driver */
-               if (dev->wakeup.flags.run_wake && !dev->wakeup.state.enabled) {
-                       spin_unlock(&acpi_device_lock);
-                       acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                         dev->wakeup.gpe_number,
-                                         ACPI_GPE_TYPE_WAKE_RUN);
-                       acpi_enable_gpe(dev->wakeup.gpe_device,
-                                       dev->wakeup.gpe_number, ACPI_NOT_ISR);
-                       dev->wakeup.state.enabled = 1;
-                       spin_lock(&acpi_device_lock);
-               }
+               if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
+                       continue;
+               spin_unlock(&acpi_device_lock);
+               acpi_set_gpe_type(dev->wakeup.gpe_device,
+                                 dev->wakeup.gpe_number,
+                                 ACPI_GPE_TYPE_WAKE_RUN);
+               acpi_enable_gpe(dev->wakeup.gpe_device,
+                               dev->wakeup.gpe_number, ACPI_NOT_ISR);
+               dev->wakeup.state.enabled = 1;
+               spin_lock(&acpi_device_lock);
        }
        spin_unlock(&acpi_device_lock);
-
        return 0;
 }
 
 late_initcall(acpi_wakeup_device_init);
-#endif
-
-/*
- * Disable all wakeup GPEs before power off.
- * 
- * Since acpi_enter_sleep_state() will disable all
- * RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from S5 as RUNTIME.
- */
-void acpi_gpe_sleep_prepare(u32 sleep_state)
-{
-       struct list_head *node, *next;
-
-       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev = container_of(node,
-                                                      struct acpi_device,
-                                                      wakeup_list);
-
-               /* The GPE can wakeup system from this state, don't touch it */
-               if ((u32) dev->wakeup.sleep_state >= sleep_state)
-                       continue;
-               /* acpi_set_gpe_type will automatically disable GPE */
-               acpi_set_gpe_type(dev->wakeup.gpe_device,
-                                 dev->wakeup.gpe_number,
-                                 ACPI_GPE_TYPE_RUNTIME);
-       }
-}