[Fwd: [PATCH] Don't save state in ACPI on shutdown/reboot]

[Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: Forwarded message - [PATCH] Don't save state in ACPI on shutdown/reboot --]
[-- Type: message/rfc822, Size: 3739 bytes --]

From: Andi Kleen <ak-h9bWGtP8wOw@public.gmane.org>
To: marcelo.tosatti-3EexvZdKGZRWk0Htik3J/w@public.gmane.org, len.brown@intel.com
Subject: [PATCH] Don't save state in ACPI on shutdown/reboot
Date: Tue, 11 Nov 2003 14:14:43 +0100
Message-ID: <20031111131443.GA23874-/48724CwFAA@public.gmane.org>


The ACPI code in 2.4 currently saves the machine state as for a 
suspend when doing an reboot or shutdown. This fails on x86-64
on some boxes.

Don't save/restore state in ACPI when entering S5.

-Andi

diff -u linux-2.4.21/drivers/acpi/system.c-o linux-2.4.21/drivers/acpi/system.c
--- linux-2.4.21/drivers/acpi/system.c-o	2003-09-23 00:40:19.000000000 +0200
+++ linux-2.4.21/drivers/acpi/system.c	2003-09-23 01:05:05.000000000 +0200
@@ -118,7 +118,8 @@
 	 * been loaded from disk.
 	 */
 	if (state > ACPI_STATE_S1) {
-		acpi_restore_state_mem();
+		if (state != ACPI_STATE_S5) 
+			acpi_restore_state_mem();
 
 		/* Do _early_ resume for irqs.  Required by
 		 * ACPI specs.
@@ -127,6 +128,7 @@
 		 * interrupts.
 		 */
 #ifdef CONFIG_X86
+		/* AK: this looks rather broken in APIC mode */
 		init_8259A(0);
 #endif
 		/* wait for power to come back */
@@ -200,7 +202,7 @@
 		ACPI_FLUSH_CPU_CACHE();
 
 		/* Do arch specific saving of state. */
-		if (state > ACPI_STATE_S1) {
+		if (state > ACPI_STATE_S1 && state < ACPI_STATE_S5) {
 			error = acpi_save_state_mem();
 
 			/* TBD: if no s4bios, write codes for