*
*/
-#define DEBUG
-
-
#include <linux/suspend.h>
#include <linux/syscalls.h>
#include <linux/reboot.h>
#include <linux/string.h>
+#include <linux/device.h>
#include <linux/delay.h>
#include <linux/fs.h>
#include "power.h"
extern u32 pm_disk_mode;
extern struct pm_ops * pm_ops;
-extern int pmdisk_save(void);
-extern int pmdisk_write(void);
-extern int pmdisk_read(void);
-extern int pmdisk_restore(void);
-extern int pmdisk_free(void);
+extern int swsusp_suspend(void);
+extern int swsusp_write(void);
+extern int swsusp_read(void);
+extern int swsusp_resume(void);
+extern int swsusp_free(void);
+static int noresume = 0;
+char resume_file[256] = CONFIG_PM_STD_PARTITION;
+
/**
* power_down - Shut machine down for hibernate.
* @mode: Suspend-to-disk mode
int error = 0;
local_irq_save(flags);
- device_power_down(PM_SUSPEND_DISK);
switch(mode) {
case PM_DISK_PLATFORM:
+ device_power_down(PM_SUSPEND_DISK);
error = pm_ops->enter(PM_SUSPEND_DISK);
break;
case PM_DISK_SHUTDOWN:
printk("Powering off system\n");
+ device_shutdown();
machine_power_off();
break;
case PM_DISK_REBOOT:
+ device_shutdown();
machine_restart(NULL);
break;
}
machine_halt();
- device_power_up();
- local_irq_restore(flags);
+ /* Valid image is on the disk, if we continue we risk serious data corruption
+ after resume. */
+ printk(KERN_CRIT "Please power me down manually\n");
+ while(1);
return 0;
}
{
device_resume();
platform_finish();
+ enable_nonboot_cpus();
thaw_processes();
pm_restore_console();
}
/* Free memory before shutting down devices. */
free_some_memory();
+ disable_nonboot_cpus();
if ((error = device_suspend(PM_SUSPEND_DISK)))
goto Finish;
Finish:
platform_finish();
Thaw:
+ enable_nonboot_cpus();
thaw_processes();
pm_restore_console();
return error;
pr_debug("PM: snapshotting memory.\n");
in_suspend = 1;
- if ((error = pmdisk_save()))
+ if ((error = swsusp_suspend()))
goto Done;
if (in_suspend) {
mb();
barrier();
- error = pmdisk_write();
+ error = swsusp_write();
if (!error) {
error = power_down(pm_disk_mode);
pr_debug("PM: Power down failed.\n");
}
} else
pr_debug("PM: Image restored successfully.\n");
- pmdisk_free();
+ swsusp_free();
Done:
finish();
return error;
/**
- * pm_resume - Resume from a saved image.
+ * software_resume - Resume from a saved image.
*
* Called as a late_initcall (so all devices are discovered and
* initialized), we call pmdisk to see if we have a saved image or not.
*
*/
-static int pm_resume(void)
+static int software_resume(void)
{
int error;
+ if (noresume) {
+ /**
+ * FIXME: If noresume is specified, we need to find the partition
+ * and reset it back to normal swap space.
+ */
+ return 0;
+ }
+
pr_debug("PM: Reading pmdisk image.\n");
- if ((error = pmdisk_read()))
+ if ((error = swsusp_read()))
goto Done;
pr_debug("PM: Preparing system for restore.\n");
barrier();
mb();
- /* FIXME: The following (comment and mdelay()) are from swsusp.
- * Are they really necessary?
- *
- * We do not want some readahead with DMA to corrupt our memory, right?
- * Do it with disabled interrupts for best effect. That way, if some
- * driver scheduled DMA, we have good chance for DMA to finish ;-).
- */
- pr_debug("PM: Waiting for DMAs to settle down.\n");
- mdelay(1000);
-
pr_debug("PM: Restoring saved image.\n");
- pmdisk_restore();
+ swsusp_resume();
pr_debug("PM: Restore failed, recovering.n");
finish();
Free:
- pmdisk_free();
+ swsusp_free();
Done:
pr_debug("PM: Resume from disk failed.\n");
return 0;
}
-late_initcall(pm_resume);
+late_initcall(software_resume);
static char * pm_disk_modes[] = {
}
core_initcall(pm_disk_init);
+
+
+static int __init resume_setup(char *str)
+{
+ if (noresume)
+ return 1;
+
+ strncpy( resume_file, str, 255 );
+ return 1;
+}
+
+static int __init noresume_setup(char *str)
+{
+ noresume = 1;
+ return 1;
+}
+
+__setup("noresume", noresume_setup);
+__setup("resume=", resume_setup);