diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-10-18 06:04:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:20 -0400 |
commit | c7e0831d385d620a58d95b25e4afa9b643f9a411 (patch) | |
tree | d3dde7c47276aeb6fad0a1f25fa6b74cc5dacfc1 /drivers | |
parent | efa4d2fb047b25a6be67fe92178a2a78da6b3f6a (diff) |
Hibernation: Check if ACPI is enabled during restore in the right place
The following scenario leads to total confusion of the platform firmware on
some boxes (eg. HPC nx6325):
* Hibernate with ACPI enabled
* Resume passing "acpi=off" to the boot kernel
To prevent this from happening it's necessary to check if ACPI is enabled (and
enable it if that's not the case) _right_ _after_ control has been transfered
from the boot kernel to the image kernel, before device_power_up() is called
(ie. with interrupts disabled). Enabling ACPI after calling
device_power_up() turns out to be insufficient.
For this reason, introduce new hibernation callback ->leave() that will be
executed before device_power_up() by the restored image kernel. To make it
work, it also is necessary to move swsusp_suspend() from swsusp.c to disk.c
(it's name is changed to "create_image", which is more up to the point).
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/sleep/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index acfb01b8ec82..048295ec3707 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -257,6 +257,15 @@ static int acpi_hibernation_enter(void) | |||
257 | return ACPI_SUCCESS(status) ? 0 : -EFAULT; | 257 | return ACPI_SUCCESS(status) ? 0 : -EFAULT; |
258 | } | 258 | } |
259 | 259 | ||
260 | static void acpi_hibernation_leave(void) | ||
261 | { | ||
262 | /* | ||
263 | * If ACPI is not enabled by the BIOS and the boot kernel, we need to | ||
264 | * enable it here. | ||
265 | */ | ||
266 | acpi_enable(); | ||
267 | } | ||
268 | |||
260 | static void acpi_hibernation_finish(void) | 269 | static void acpi_hibernation_finish(void) |
261 | { | 270 | { |
262 | acpi_leave_sleep_state(ACPI_STATE_S4); | 271 | acpi_leave_sleep_state(ACPI_STATE_S4); |
@@ -288,6 +297,7 @@ static struct platform_hibernation_ops acpi_hibernation_ops = { | |||
288 | .finish = acpi_hibernation_finish, | 297 | .finish = acpi_hibernation_finish, |
289 | .prepare = acpi_hibernation_prepare, | 298 | .prepare = acpi_hibernation_prepare, |
290 | .enter = acpi_hibernation_enter, | 299 | .enter = acpi_hibernation_enter, |
300 | .leave = acpi_hibernation_leave, | ||
291 | .pre_restore = acpi_hibernation_pre_restore, | 301 | .pre_restore = acpi_hibernation_pre_restore, |
292 | .restore_cleanup = acpi_hibernation_restore_cleanup, | 302 | .restore_cleanup = acpi_hibernation_restore_cleanup, |
293 | }; | 303 | }; |