[PATCH] PM: Change code ordering in main.c

As indicated in a recent thread on Linux-PM, it's necessary to call
pm_ops->finish() before devce_resume(), but enable_nonboot_cpus() has to be
called before pm_ops->finish() (cf.
http://lists.osdl.org/pipermail/linux-pm/2006-November/004164.html).  For
consistency, it seems reasonable to call disable_nonboot_cpus() after
device_suspend().

This way the suspend code will remain symmetrical with respect to the resume
code and it may allow us to speed up things in the future by suspending and
resuming devices and/or saving the suspend image in many threads.

The following series of patches reorders the suspend and resume code so that
nonboot CPUs are disabled after devices have been suspended and enabled before
the devices are resumed.  It also causes pm_ops->finish() to be called after
enable_nonboot_cpus() wherever necessary.

This patch:

Change the ordering of code in kernel/power/main.c so that device_suspend()
is called before disable_nonboot_cpus() and pm_ops->finish() is called after
enable_nonboot_cpus() and before device_resume(), as indicated by recent
discussion on Linux-PM
(cf. http://lists.osdl.org/pipermail/linux-pm/2006-November/004164.html).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Greg KH <greg@kroah.com>
Cc: Nigel Cunningham <nigel@suspend2.net>
Cc: Patrick Mochel <mochel@digitalimplant.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 19 insertions, 15 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 47ca5a2b653b..e1c413120469 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -44,6 +44,11 @@ void pm_set_ops(struct pm_ops * ops)
         mutex_unlock(&pm_mutex);
 }
 
+static inline void pm_finish(suspend_state_t state)
+{
+        if (pm_ops->finish)
+                pm_ops->finish(state);
+}
 
 /**
  *      suspend_prepare - Do prep work before entering low-power state.
@@ -64,10 +69,6 @@ static int suspend_prepare(suspend_state_t state)
 
         pm_prepare_console();
 
-        error = disable_nonboot_cpus();
-        if (error)
-                goto Enable_cpu;
-
         if (freeze_processes()) {
                 error = -EAGAIN;
                 goto Thaw;
@@ -90,18 +91,22 @@ static int suspend_prepare(suspend_state_t state)
         }
 
         suspend_console();
-        if ((error = device_suspend(PMSG_SUSPEND))) {
+        error = device_suspend(PMSG_SUSPEND);
+        if (error) {
                 printk(KERN_ERR "Some devices failed to suspend\n");
-                goto Finish;
+                goto Resume_devices;
         }
-        return 0;
- Finish:
-        if (pm_ops->finish)
-                pm_ops->finish(state);
+        error = disable_nonboot_cpus();
+        if (!error)
+                return 0;
+
+        enable_nonboot_cpus();
+ Resume_devices:
+        pm_finish(state);
+        device_resume();
+        resume_console();
  Thaw:
         thaw_processes();
- Enable_cpu:
-        enable_nonboot_cpus();
         pm_restore_console();
         return error;
 }
@@ -136,12 +141,11 @@ int suspend_enter(suspend_state_t state)
 
 static void suspend_finish(suspend_state_t state)
 {
+        enable_nonboot_cpus();
+        pm_finish(state);
         device_resume();
         resume_console();
         thaw_processes();
-        enable_nonboot_cpus();
-        if (pm_ops && pm_ops->finish)
-                pm_ops->finish(state);
         pm_restore_console();
 }