Skip to contentSkip to conversation

change suspend_finish order slightly

RFC In review Shaohua Li 3 participants 3 messages Dec 2, 2005 – Dec 4, 2005

Subsystems (2)
lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

RFC 1/1 change suspend_finish order slightly

The BIOS guys here require ACPI _WAK method which is called in pm_ops->finish is invoked after all CPUs are resumed. Detail info can be found at http://bugzilla.kernel.org/show_bug.cgi?id=5651. To do this, this patch tries to change the order slightly. Does this break other platforms?

Thanks,
Shaohua
---

 linux-2.6.14-root/kernel/power/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/power/main.c renamed from kernel/power/main.c~smp_s3_order +2 -2
diff -puN kernel/power/main.c~smp_s3_order kernel/power/main.c
@@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t
 static void suspend_finish(suspend_state_t state)
 {
 	device_resume();
-	if (pm_ops && pm_ops->finish)
-		pm_ops->finish(state);
 	thaw_processes();
 	enable_nonboot_cpus();
+	if (pm_ops && pm_ops->finish)
+		pm_ops->finish(state);
 	pm_restore_console();
 }
 

_

#1 lore raw
Quoted 25 lines · Shaohua Li

The BIOS guys here require ACPI _WAK method which is called in pm_ops->finish is invoked after all CPUs are resumed. Detail info can be found at http://bugzilla.kernel.org/show_bug.cgi?id=5651. To do this, this patch tries to change the order slightly. Does this break other platforms?

 linux-2.6.14-root/kernel/power/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN kernel/power/main.c~smp_s3_order kernel/power/main.c

kernel/power/main.c renamed from kernel/power/main.c~smp_s3_order +2 -2
@@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t
 static void suspend_finish(suspend_state_t state)
 {
 	device_resume();
-	if (pm_ops && pm_ops->finish)
-		pm_ops->finish(state);
 	thaw_processes();
 	enable_nonboot_cpus();
+	if (pm_ops && pm_ops->finish)
+		pm_ops->finish(state);
 	pm_restore_console();
 }
 
Quoted 1 line

_

ACKed-by Patrick Mochel <[email protected]>

#2 lore raw
In reply to Shaohua Li

Hi.

Quoted 5 lines · Shaohua Li

The BIOS guys here require ACPI _WAK method which is called in pm_ops->finish is invoked after all CPUs are resumed. Detail info can be found at http://bugzilla.kernel.org/show_bug.cgi?id=5651. To do this, this patch tries to change the order slightly. Does this break other platforms?

Is it needed even if you call the prepare after hot unplugging other cpus? (If so, I need to modify suspend2, too).

Regards,

Nigel

Quoted 32 lines

Thanks,
Shaohua
---

 linux-2.6.14-root/kernel/power/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN kernel/power/main.c~smp_s3_order kernel/power/main.c

kernel/power/main.c renamed from kernel/power/main.c~smp_s3_order +2 -2
@@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t
 static void suspend_finish(suspend_state_t state)
 {
 	device_resume();
-	if (pm_ops && pm_ops->finish)
-		pm_ops->finish(state);
 	thaw_processes();
 	enable_nonboot_cpus();
+	if (pm_ops && pm_ops->finish)
+		pm_ops->finish(state);
 	pm_restore_console();
 }
 

_

______________________________________________________________________
_______________________________________________
linux-pm mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/linux-pm