Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754461AbXL0SEX (ORCPT ); Thu, 27 Dec 2007 13:04:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754018AbXL0SCB (ORCPT ); Thu, 27 Dec 2007 13:02:01 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:43432 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753835AbXL0SBm (ORCPT ); Thu, 27 Dec 2007 13:01:42 -0500 From: "Rafael J. Wysocki" To: ACPI Devel Maling List Subject: [RFC][PATCH 6/7] Hibernation: Call _PTS early on ACPI 1.0x systems Date: Thu, 27 Dec 2007 19:19:10 +0100 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: Arjan van de Ven , Carlos Corbacho , Linus Torvalds , LKML , Pavel Machek , pm list , Andrew Morton , Len Brown , Alexey Starikovskiy , "Moore, Robert" References: <200712271903.53961.rjw@sisk.pl> In-Reply-To: <200712271903.53961.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200712271919.12184.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2899 Lines: 92 From: Rafael J. Wysocki 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 --- 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/