3 files changed, 66 insertions, 18 deletions

diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 81b248429703..13c93a13785e 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -192,18 +192,13 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
         arg.type = ACPI_TYPE_INTEGER;
         arg.integer.value = sleep_state;
 
-        /* Run the _PTS and _GTS methods */
+        /* Run the _PTS method */
 
         status = acpi_evaluate_object(NULL, METHOD_NAME__PTS, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
                 return_ACPI_STATUS(status);
         }
 
-        status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                return_ACPI_STATUS(status);
-        }
-
         /* Setup the argument to _SST */
 
         switch (sleep_state) {
@@ -262,6 +257,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
         struct acpi_bit_register_info *sleep_type_reg_info;
         struct acpi_bit_register_info *sleep_enable_reg_info;
         u32 in_value;
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE(acpi_enter_sleep_state);
@@ -307,6 +304,18 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
                 return_ACPI_STATUS(status);
         }
 
+        /* Execute the _GTS method */
+
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+        arg.type = ACPI_TYPE_INTEGER;
+        arg.integer.value = sleep_state;
+
+        status = acpi_evaluate_object(NULL, METHOD_NAME__GTS, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                return_ACPI_STATUS(status);
+        }
+
         /* Get current value of PM1A control */
 
         status = acpi_hw_register_read(ACPI_REGISTER_PM1_CONTROL, &PM1Acontrol);
@@ -473,17 +482,18 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_leave_sleep_state
+ * FUNCTION:    acpi_leave_sleep_state_prep
  *
- * PARAMETERS:  sleep_state         - Which sleep state we just exited
+ * PARAMETERS:  sleep_state         - Which sleep state we are exiting
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
- *              Called with interrupts ENABLED.
+ * DESCRIPTION: Perform the first state of OS-independent ACPI cleanup after a
+ *              sleep.
+ *              Called with interrupts DISABLED.
  *
  ******************************************************************************/
-acpi_status acpi_leave_sleep_state(u8 sleep_state)
+acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
 {
         struct acpi_object_list arg_list;
         union acpi_object arg;
@@ -493,7 +503,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
         u32 PM1Acontrol;
         u32 PM1Bcontrol;
 
-        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
+        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
 
         /*
          * Set SLP_TYPE and SLP_EN to state S0.
@@ -540,6 +550,41 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
                 }
         }
 
+        /* Execute the _BFS method */
+
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+        arg.type = ACPI_TYPE_INTEGER;
+        arg.integer.value = sleep_state;
+
+        status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
+        }
+
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_leave_sleep_state
+ *
+ * PARAMETERS:  sleep_state         - Which sleep state we just exited
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Perform OS-independent ACPI cleanup after a sleep
+ *              Called with interrupts ENABLED.
+ *
+ ******************************************************************************/
+acpi_status acpi_leave_sleep_state(u8 sleep_state)
+{
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_leave_sleep_state);
+
         /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
 
         acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID;
@@ -558,12 +603,6 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
                 ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
         }
 
-        arg.integer.value = sleep_state;
-        status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
-        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
-        }
-
         /*
          * GPEs must be enabled before _WAK is called as GPEs
          * might get fired there
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index e2e4e617952b..fdd8139b3f98 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -139,6 +139,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 ]
@@ -272,6 +275,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;
@@ -284,6 +289,8 @@ 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)
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 9512f0456ad1..b729e64d0d4c 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -335,6 +335,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state);
 
 acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void);
 
+acpi_status acpi_leave_sleep_state_prep(u8 sleep_state);
+
 acpi_status acpi_leave_sleep_state(u8 sleep_state);
 
 #endif                          /* __ACXFACE_H__ */