lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hibernation: Enter platform hibernation state in a consistent way

Browse Source 
Make hibernation_platform_enter() execute the enter-a-sleep-state sequence
instead of the mixed shutdown-with-entering-S4 thing.

Replace the shutting down of devices done by kernel_shutdown_prepare(), before
entering the ACPI S4 sleep state, with suspending them and the shutting down
of sysdevs with calling device_power_down(PMSG_SUSPEND) (just like before
entering S1 or S3, but the target state is now S4).   Also, disable the
nonboot CPUs before entering the sleep state (S4), which generally always is a
good idea.

This is known to fix the "double disk spin down during hibernation" on some
machines, eg.  HPC nx6325 (ref.  http://lkml.org/lkml/2007/8/7/316 and the
following thread).   Moreover, it has been reported to make
/sys/class/rtc/rtc0/wakealarm work correctly with hibernation for some users.
It also generally causes the hibernation state (ACPI S4) to be entered faster.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rafael J. Wysocki
2007-10-18 03:04:56 -07:00
committed by Linus Torvalds
parent c7e0831d38
commit 9cd9a0058d
1 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
kernel/power/disk.c
View File

@@ -278,21 +278,50 @@ int hibernation_platform_enter(void)
{ {
int error; int error;
if (hibernation_ops) { if (!hibernation_ops)
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK); return -ENOSYS;
/*
* We have cancelled the power transition by running /*
* hibernation_ops->finish() before saving the image, so we * We have cancelled the power transition by running
* should let the firmware know that we're going to enter the * hibernation_ops->finish() before saving the image, so we should let
* sleep state after all * the firmware know that we're going to enter the sleep state after all
*/ */
error = hibernation_ops->prepare(); error = hibernation_ops->start();
sysdev_shutdown(); if (error)
if (!error) return error;
error = hibernation_ops->enter();
} else { suspend_console();
error = -ENOSYS; error = device_suspend(PMSG_SUSPEND);
if (error)
goto Resume_console;
error = hibernation_ops->prepare();
if (error)
goto Resume_devices;
error = disable_nonboot_cpus();
if (error)
goto Finish;
local_irq_disable();
error = device_power_down(PMSG_SUSPEND);
if (!error) {
hibernation_ops->enter();
/* We should never get here */
while (1);
} }
local_irq_enable();
/*
* We don't need to reenable the nonboot CPUs or resume consoles, since
* the system is going to be halted anyway.
*/
Finish:
hibernation_ops->finish();
Resume_devices:
device_resume();
Resume_console:
resume_console();
return error; return error;
} }
@@ -309,14 +338,14 @@ static void power_down(void)
case HIBERNATION_TEST: case HIBERNATION_TEST:
case HIBERNATION_TESTPROC: case HIBERNATION_TESTPROC:
break; break;
case HIBERNATION_SHUTDOWN:
kernel_power_off();
break;
case HIBERNATION_REBOOT: case HIBERNATION_REBOOT:
kernel_restart(NULL); kernel_restart(NULL);
break; break;
case HIBERNATION_PLATFORM: case HIBERNATION_PLATFORM:
hibernation_platform_enter(); hibernation_platform_enter();
case HIBERNATION_SHUTDOWN:
kernel_power_off();
break;
} }
kernel_halt(); kernel_halt();
/* /*