aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-10-18 06:04:55 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:20 -0400
commitc7e0831d385d620a58d95b25e4afa9b643f9a411 (patch)
treed3dde7c47276aeb6fad0a1f25fa6b74cc5dacfc1 /include
parentefa4d2fb047b25a6be67fe92178a2a78da6b3f6a (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 'include')
-rw-r--r--include/linux/suspend.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 9fd2b9acf7d9..4360e0816956 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -156,6 +156,12 @@ extern void mark_free_pages(struct zone *zone);
156 * Called after the nonboot CPUs have been disabled and all of the low 156 * Called after the nonboot CPUs have been disabled and all of the low
157 * level devices have been shut down (runs with IRQs off). 157 * level devices have been shut down (runs with IRQs off).
158 * 158 *
159 * @leave: Perform the first stage of the cleanup after the system sleep state
160 * indicated by @set_target() has been left.
161 * Called right after the control has been passed from the boot kernel to
162 * the image kernel, before the nonboot CPUs are enabled and before devices
163 * are resumed. Executed with interrupts disabled.
164 *
159 * @pre_restore: Prepare system for the restoration from a hibernation image. 165 * @pre_restore: Prepare system for the restoration from a hibernation image.
160 * Called right after devices have been frozen and before the nonboot 166 * Called right after devices have been frozen and before the nonboot
161 * CPUs are disabled (runs with IRQs on). 167 * CPUs are disabled (runs with IRQs on).
@@ -170,6 +176,7 @@ struct platform_hibernation_ops {
170 void (*finish)(void); 176 void (*finish)(void);
171 int (*prepare)(void); 177 int (*prepare)(void);
172 int (*enter)(void); 178 int (*enter)(void);
179 void (*leave)(void);
173 int (*pre_restore)(void); 180 int (*pre_restore)(void);
174 void (*restore_cleanup)(void); 181 void (*restore_cleanup)(void);
175}; 182};