PATCH: Call acpi_leave_sleep_state before resuming devices

["Stefan Dösinger" <stefandoesinger-RbZlAiThDcE@public.gmane.org>]

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

Hello,

Here's again the resume-finish-split patch, this time CC-ed to Len.

This patch splits up acpi_pm_leave. It introduces acpi_pm_leave which calls 
acpi_leave_sleep_state and acpi_disable_wakeup_device before resuming the 
devices. This improves S3 resume on an Acer Travelmate 800 and on the Samsung 
P3 notebook.

Some archive references:
http://sourceforge.net/mailarchive/message.php?msg_id=9091506
http://sourceforge.net/mailarchive/message.php?msg_id=10315947

The background is that any write access to the pci config registers of some 
devices(sound card, usb 2.0 controler, and modem) cause a system lockup if 
they are called before acpi_leave_sleep_state and acpi_disable_wakeup_device 
were called. This is on an Acer Travelmate 803 Notebook, and it seems to be 
the same on other systems.

I sent the patch to the list, but it seems that nobody noticed it and I forgot 
to send it again. Here is an updated patch against 2.6.10. I can't promise 
that it doesn't break other systems. Someone should make sure that 
pm_ops->leave is set to NULL for apm. I haven't found this in the apm code 
yet.

Cheers,
Stefan Dösinger

[-- Attachment #2: resume-finish-split.patch --]
[-- Type: text/x-diff, Size: 1855 bytes --]

--- linux-2.6.10/include/linux/pm.h	2004-12-26 15:25:39.639998872 +0100
+++ include/linux/pm.h	2004-12-26 15:27:10.885127504 +0100
@@ -208,6 +208,7 @@
 	suspend_disk_method_t pm_disk_mode;
 	int (*prepare)(suspend_state_t state);
 	int (*enter)(suspend_state_t state);
+	int (*leave)(suspend_state_t state);
 	int (*finish)(suspend_state_t state);
 };
 
--- linux-2.6.10/kernel/power/main.c	2004-12-26 15:25:54.377758392 +0100
+++ kernel/power/main.c	2004-12-26 15:26:31.472119192 +0100
@@ -104,6 +104,8 @@
 
 static void suspend_finish(suspend_state_t state)
 {
+	if (pm_ops && pm_ops->leave)
+		pm_ops->leave(state);
 	device_resume();
 	if (pm_ops && pm_ops->finish)
 		pm_ops->finish(state);
--- linux-2.6.10/drivers/acpi/sleep/main.c	2004-12-26 15:25:20.314936728 +0100
+++ drivers/acpi/sleep/main.c	2004-12-26 15:28:49.253173288 +0100
@@ -130,7 +130,23 @@
 	return ACPI_SUCCESS(status) ? 0 : -EFAULT;
 }
 
+/**
+ *	acpi_pm_leave - Make system ready to resume devices.
+ *	@pm_state:		State we're coming out of.
+ *
+ *	This is called after we wake back up and before device
+ *	resume methods are called.
+ */
+
+static int acpi_pm_leave(suspend_state_t pm_state)
+{
+	u32 acpi_state = acpi_suspend_states[pm_state];
 
+	acpi_leave_sleep_state(acpi_state);
+	acpi_disable_wakeup_device(acpi_state);
+	
+	return 0;
+}
 /**
  *	acpi_pm_finish - Finish up suspend sequence.
  *	@pm_state:		State we're coming out of.
@@ -143,9 +159,6 @@
 {
 	u32 acpi_state = acpi_suspend_states[pm_state];
 
-	acpi_leave_sleep_state(acpi_state);
-	acpi_disable_wakeup_device(acpi_state);
-
 	/* reset firmware waking vector */
 	acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
@@ -173,6 +186,7 @@
 static struct pm_ops acpi_pm_ops = {
 	.prepare	= acpi_pm_prepare,
 	.enter		= acpi_pm_enter,
+	.leave		= acpi_pm_leave,
 	.finish		= acpi_pm_finish,
 };