From: Rafael J. Wysocki <rjw@xxxxxxx> The ACPI 1.0 specification wants us to put devices into low power states after executing the _PTS global control methods, while ACPI 2.0 and later want us to do that in the reverse order. The current hibernation code follows ACPI 2.0 in that respect which may cause some ACPI 1.0x systems to hang during hibernation (ref. http://bugzilla.kernel.org/show_bug.cgi?id=9528). Make the hibernation code execute _PTS before putting devices into low power states on ACPI 1.0x systems (i.e. on systems for which the revision in the FADT header is lesser than 3). Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> --- drivers/acpi/sleep/main.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) Index: linux-2.6/drivers/acpi/sleep/main.c =================================================================== --- linux-2.6.orig/drivers/acpi/sleep/main.c +++ linux-2.6/drivers/acpi/sleep/main.c @@ -271,21 +271,35 @@ static struct dmi_system_id __initdata a static int acpi_hibernation_open(void) { acpi_target_sleep_state = ACPI_STATE_S4; + + /* On ACPI 1.0x systems _PTS has to be executed right now. */ + if (acpi_gbl_FADT.header.revision < 3) { + 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 0; } static int acpi_hibernation_prepare(void) { - int error; - - error = acpi_sleep_prepare(ACPI_STATE_S4); - if (error) - return error; - - if (!ACPI_SUCCESS(acpi_hw_disable_all_gpes())) - error = -EFAULT; + /* On ACPI 1.0x systems _PTS global is executed earlier. */ + if (acpi_gbl_FADT.header.revision >= 3) { + 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 error; + return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT; } static int acpi_hibernation_enter(void) @@ -326,15 +340,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_close(void) { /* * This is necessary in case acpi_hibernation_finish() is not called - * during a failing transition to the sleep state. + * directly during a failing transition to the sleep state. */ - acpi_target_sleep_state = ACPI_STATE_S0; + if (acpi_sleep_finish_wake_up) + acpi_hibernation_finish(); } static int acpi_hibernation_pre_restore(void) - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
