From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761195AbYKDX5E (ORCPT ); Tue, 4 Nov 2008 18:57:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757933AbYKDXlG (ORCPT ); Tue, 4 Nov 2008 18:41:06 -0500 Received: from mail.suse.de ([195.135.220.2]:47928 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756947AbYKDXlF (ORCPT ); Tue, 4 Nov 2008 18:41:05 -0500 Date: Tue, 4 Nov 2008 15:33:27 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Len Brown , Matthew Garrett , Andi Kleen Subject: [patch 52/57] ACPI: Clear WAK_STS on resume Message-ID: <20081104233327.GA659@suse.de> References: <20081104232144.186593464@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="acpi-clear-wak_sts-on-resume.patch" In-Reply-To: <20081104233028.GA659@suse.de> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Matthew Garrett Subject: [patch 52/57] ACPI: Clear WAK_STS on resume commit a68823ee5285e65b51ceb96f8b13a5b4f99a6888 upstream. ACPI: Clear WAK_STS on resume The leading other brand OS appears to clear the WAK_STS flag on resume. When rebooted, certain BIOSes assume that the system is actually resuming if it's still set and so fail to reboot correctly. Make sure that it's cleared at resume time. Comment clarified as suggested by Bob Moore http://bugzilla.kernel.org/show_bug.cgi?id=11634 Signed-off-by: Matthew Garrett Signed-off-by: Andi Kleen Tested-by: Christian Borntraeger Tested-by: Romano Giannetti Signed-off-by: Len Brown Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/hardware/hwsleep.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -612,6 +612,13 @@ acpi_status acpi_leave_sleep_state(u8 sl } /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */ + /* + * Some BIOSes assume that WAK_STS will be cleared on resume and use + * it to determine whether the system is rebooting or resuming. Clear + * it for compatibility. + */ + acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1); + acpi_gbl_system_awake_and_running = TRUE; /* Enable power button */ --