Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (38 commits)
  suspend: cleanup reference to swsusp_pg_dir[]
  PM: Remove obsolete /sys/devices/.../power/state docs
  Hibernation: Invoke suspend notifications after console switch
  Suspend: Invoke suspend notifications after console switch
  Suspend: Clean up suspend_64.c
  Suspend: Add config option to disable the freezer if architecture wants that
  ACPI: Print message before calling _PTS
  ACPI hibernation: Call _PTS before suspending devices
  Hibernation: Introduce begin() and end() callbacks
  ACPI suspend: Call _PTS before suspending devices
  ACPI: Separate disabling of GPEs from _PTS
  ACPI: Separate invocations of _GTS and _BFS from _PTS and _WAK
  Suspend: Introduce begin() and end() callbacks
  suspend: fix ia64 allmodconfig build
  ACPI: clear GPE earily in resume to avoid warning
  Suspend: Clean up Kconfig (V2)
  Hibernation: Clean up Kconfig (V2)
  Hibernation: Update messages
  Suspend: Use common prefix in messages
  Hibernation: Remove unnecessary variable declaration
  ...

2 files changed, 108 insertions, 23 deletions

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 2c0b6630f8ba..485de1347075 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -26,9 +26,24 @@ u8 sleep_states[ACPI_S_STATE_COUNT];
 
 #ifdef CONFIG_PM_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+static bool acpi_sleep_finish_wake_up;
+
+/*
+ * ACPI 2.0 and later want us to execute _PTS after suspending devices, so we
+ * allow the user to request that behavior by using the 'acpi_new_pts_ordering'
+ * kernel command line option that causes the following variable to be set.
+ */
+static bool new_pts_ordering;
+
+static int __init acpi_new_pts_ordering(char *str)
+{
+        new_pts_ordering = true;
+        return 1;
+}
+__setup("acpi_new_pts_ordering", acpi_new_pts_ordering);
 #endif
 
-int acpi_sleep_prepare(u32 acpi_state)
+static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
         /* do we have a wakeup address for S2 and S3? */
@@ -44,6 +59,8 @@ int acpi_sleep_prepare(u32 acpi_state)
         ACPI_FLUSH_CPU_CACHE();
         acpi_enable_wakeup_device_prep(acpi_state);
 #endif
+        printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",
+                acpi_state);
         acpi_enter_sleep_state_prep(acpi_state);
         return 0;
 }
@@ -63,17 +80,25 @@ static u32 acpi_suspend_states[] = {
 static int init_8259A_after_S1;
 
 /**
- *      acpi_pm_set_target - Set the target system sleep state to the state
+ *      acpi_pm_begin - Set the target system sleep state to the state
  *              associated with given @pm_state, if supported.
  */
 
-static int acpi_pm_set_target(suspend_state_t pm_state)
+static int acpi_pm_begin(suspend_state_t pm_state)
 {
         u32 acpi_state = acpi_suspend_states[pm_state];
         int error = 0;
 
         if (sleep_states[acpi_state]) {
                 acpi_target_sleep_state = acpi_state;
+                if (new_pts_ordering)
+                        return 0;
+
+                error = acpi_sleep_prepare(acpi_state);
+                if (error)
+                        acpi_target_sleep_state = ACPI_STATE_S0;
+                else
+                        acpi_sleep_finish_wake_up = true;
         } else {
                 printk(KERN_ERR "ACPI does not support this state: %d\n",
                         pm_state);
@@ -91,12 +116,17 @@ static int acpi_pm_set_target(suspend_state_t pm_state)
 
 static int acpi_pm_prepare(void)
 {
-        int error = acpi_sleep_prepare(acpi_target_sleep_state);
+        if (new_pts_ordering) {
+                int error = acpi_sleep_prepare(acpi_target_sleep_state);
 
-        if (error)
-                acpi_target_sleep_state = ACPI_STATE_S0;
+                if (error) {
+                        acpi_target_sleep_state = ACPI_STATE_S0;
+                        return error;
+                }
+                acpi_sleep_finish_wake_up = true;
+        }
 
-        return error;
+        return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
 }
 
 /**
@@ -120,10 +150,8 @@ static int acpi_pm_enter(suspend_state_t pm_state)
         if (acpi_state == ACPI_STATE_S3) {
                 int error = acpi_save_state_mem();
 
-                if (error) {
-                        acpi_target_sleep_state = ACPI_STATE_S0;
+                if (error)
                         return error;
-                }
         }
 
         local_irq_save(flags);
@@ -139,6 +167,9 @@ static int acpi_pm_enter(suspend_state_t pm_state)
                 break;
         }
 
+        /* Reprogram control registers and execute _BFS */
+        acpi_leave_sleep_state_prep(acpi_state);
+
         /* ACPI 3.0 specs (P62) says that it's the responsabilty
          * of the OSPM to clear the status bit [ implying that the
          * POWER_BUTTON event should not reach userspace ]
@@ -146,6 +177,13 @@ static int acpi_pm_enter(suspend_state_t pm_state)
         if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
                 acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
 
+        /*
+         * Disable and clear GPE status before interrupt is enabled. Some GPEs
+         * (like wakeup GPE) haven't handler, this can avoid such GPE misfire.
+         * acpi_leave_sleep_state will reenable specific GPEs later
+         */
+        acpi_hw_disable_all_gpes();
+
         local_irq_restore(flags);
         printk(KERN_DEBUG "Back to C!\n");
 
@@ -157,7 +195,7 @@ static int acpi_pm_enter(suspend_state_t pm_state)
 }
 
 /**
- *      acpi_pm_finish - Finish up suspend sequence.
+ *      acpi_pm_finish - Instruct the platform to leave a sleep state.
  *
  *      This is called after we wake back up (or if entering the sleep state
  *      failed). 
@@ -174,6 +212,7 @@ static void acpi_pm_finish(void)
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
         acpi_target_sleep_state = ACPI_STATE_S0;
+        acpi_sleep_finish_wake_up = false;
 
 #ifdef CONFIG_X86
         if (init_8259A_after_S1) {
@@ -183,6 +222,20 @@ static void acpi_pm_finish(void)
 #endif
 }
 
+/**
+ *      acpi_pm_end - Finish up suspend sequence.
+ */
+
+static void acpi_pm_end(void)
+{
+        /*
+         * This is necessary in case acpi_pm_finish() is not called directly
+         * during a failing transition to a sleep state.
+         */
+        if (acpi_sleep_finish_wake_up)
+                acpi_pm_finish();
+}
+
 static int acpi_pm_state_valid(suspend_state_t pm_state)
 {
         u32 acpi_state;
@@ -201,10 +254,11 @@ static int acpi_pm_state_valid(suspend_state_t pm_state)
 
 static struct platform_suspend_ops acpi_pm_ops = {
         .valid = acpi_pm_state_valid,
-        .set_target = acpi_pm_set_target,
+        .begin = acpi_pm_begin,
         .prepare = acpi_pm_prepare,
         .enter = acpi_pm_enter,
         .finish = acpi_pm_finish,
+        .end = acpi_pm_end,
 };
 
 /*
@@ -229,15 +283,36 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
-static int acpi_hibernation_start(void)
+static int acpi_hibernation_begin(void)
 {
+        int error;
+
         acpi_target_sleep_state = ACPI_STATE_S4;
-        return 0;
+        if (new_pts_ordering)
+                return 0;
+
+        error = acpi_sleep_prepare(ACPI_STATE_S4);
+        if (error)
+                acpi_target_sleep_state = ACPI_STATE_S0;
+        else
+                acpi_sleep_finish_wake_up = true;
+
+        return error;
 }
 
 static int acpi_hibernation_prepare(void)
 {
-        return acpi_sleep_prepare(ACPI_STATE_S4);
+        if (new_pts_ordering) {
+                int error = acpi_sleep_prepare(ACPI_STATE_S4);
+
+                if (error) {
+                        acpi_target_sleep_state = ACPI_STATE_S0;
+                        return error;
+                }
+                acpi_sleep_finish_wake_up = true;
+        }
+
+        return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
 }
 
 static int acpi_hibernation_enter(void)
@@ -251,6 +326,8 @@ static int acpi_hibernation_enter(void)
         acpi_enable_wakeup_device(ACPI_STATE_S4);
         /* This shouldn't return.  If it returns, we have a problem */
         status = acpi_enter_sleep_state(ACPI_STATE_S4);
+        /* Reprogram control registers and execute _BFS */
+        acpi_leave_sleep_state_prep(ACPI_STATE_S4);
         local_irq_restore(flags);
 
         return ACPI_SUCCESS(status) ? 0 : -EFAULT;
@@ -263,15 +340,12 @@ static void acpi_hibernation_leave(void)
          * enable it here.
          */
         acpi_enable();
+        /* Reprogram control registers and execute _BFS */
+        acpi_leave_sleep_state_prep(ACPI_STATE_S4);
 }
 
 static void acpi_hibernation_finish(void)
 {
-        /*
-         * If ACPI is not enabled by the BIOS and the boot kernel, we need to
-         * enable it here.
-         */
-        acpi_enable();
         acpi_disable_wakeup_device(ACPI_STATE_S4);
         acpi_leave_sleep_state(ACPI_STATE_S4);
 
@@ -279,6 +353,17 @@ static void acpi_hibernation_finish(void)
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
         acpi_target_sleep_state = ACPI_STATE_S0;
+        acpi_sleep_finish_wake_up = false;
+}
+
+static void acpi_hibernation_end(void)
+{
+        /*
+         * This is necessary in case acpi_hibernation_finish() is not called
+         * directly during a failing transition to the sleep state.
+         */
+        if (acpi_sleep_finish_wake_up)
+                acpi_hibernation_finish();
 }
 
 static int acpi_hibernation_pre_restore(void)
@@ -296,7 +381,8 @@ static void acpi_hibernation_restore_cleanup(void)
 }
 
 static struct platform_hibernation_ops acpi_hibernation_ops = {
-        .start = acpi_hibernation_start,
+        .begin = acpi_hibernation_begin,
+        .end = acpi_hibernation_end,
         .pre_snapshot = acpi_hibernation_prepare,
         .finish = acpi_hibernation_finish,
         .prepare = acpi_hibernation_prepare,
@@ -403,6 +489,7 @@ static void acpi_power_off_prepare(void)
 {
         /* Prepare to power off the system */
         acpi_sleep_prepare(ACPI_STATE_S5);
+        acpi_hw_disable_all_gpes();
 }
 
 static void acpi_power_off(void)
diff --git a/drivers/acpi/sleep/sleep.h b/drivers/acpi/sleep/sleep.h
index a2ea125ae2d0..cfaf8f5b0a14 100644
--- a/drivers/acpi/sleep/sleep.h
+++ b/drivers/acpi/sleep/sleep.h
@@ -5,5 +5,3 @@ extern int acpi_suspend (u32 state);
 extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
 extern void acpi_enable_wakeup_device(u8 sleep_state);
 extern void acpi_disable_wakeup_device(u8 sleep_state);
-
-extern int acpi_sleep_prepare(u32 acpi_state);