revert swsusp to -test3 state
Subsystems (2)
Hi!
This patch reverts swsusp to -test3 state, known-working, before Patrick rewrote it without testing.
Functionality is still not back to -test3 state due to driver model changes, I hope to fix then eventually, then try apply his patches (this time with testing).
Please apply,
Pavel
kernel/power/main.c +1 -68
@@ -172,31 +172,10 @@static int pm_suspend_disk (void ) { -int error; -pr_debug ("PM: Attempting to suspend to disk.\n" );if (pm_disk_mode ==PM_DISK_FIRMWARE )return pm_ops->enter (PM_SUSPEND_DISK ); - -if (!have_swsusp) -return -EPERM ; - -pr_debug ("PM: snapshotting memory.\n" ); - in_suspend =1 ; -if ((error =swsusp_save ())) - goto Done; - -if (in_suspend) { -pr_debug ("PM: writing image.\n" ); - 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" ); -swsusp_free (); - Done: -return error; +return 0 ; }
@@ -329,59 +308,13 @@int pm_suspend (u32 state) {if (state >PM_SUSPEND_ON && state <PM_SUSPEND_MAX )return enter_state (state);return -EINVAL ; } - -/** -* pm_resume - Resume from a saved image. -* -* Called as a late_initcall (so all devices are discovered and -* initialized), we call swsusp to see if we have a saved image or not. -* If so, we quiesce devices, the restore the saved image. We will -* return above (in pm_suspend_disk() ) if everything goes well. -* Otherwise, we fail gracefully and return to the normally -* scheduled program. -* -*/ - -static int pm_resume (void ) -{ -int error; - -if (!have_swsusp) -return 0 ; - -pr_debug ("PM: Reading swsusp image.\n" ); - -if ((error =swsusp_read ())) - goto Done; - -pr_debug ("PM: Preparing system for restore.\n" ); - -if ((error =suspend_prepare (PM_SUSPEND_DISK ))) - goto Free; - -pr_debug ("PM: Restoring saved image.\n" ); -swsusp_restore (); - -pr_debug ("PM: Restore failed, recovering.n" ); -suspend_finish (PM_SUSPEND_DISK ); - Free: -swsusp_free (); - Done: -pr_debug ("PM: Resume from disk failed.\n" ); -return 0 ; -} - -late_initcall (pm_resume); - -decl_subsys (power,NULL ,NULL ); -#define power_attr (_name) \ static struct subsys_attribute _name##_attr = { \ .attr = { \
kernel/power/swsusp.c +322 -109
610 lines not on this page · raw message
include/linux/suspend.h +37 -2
@@ -8,7 +8,11 @@#include <linux/notifier.h> #include <linux/config.h> #include <linux/init.h> -#include <linux/pm.h> + +extern unsigned char software_suspend_enabled; + +#define NORESUME 1 +#define RESUME_SPECIFIED 2#ifdef CONFIG_SOFTWARE_SUSPEND /* page backup entry */
@@ -45,30 +49,61 @@/* mm/page_alloc.c */ extern void drain_local_pages (void ); +/* kernel/suspend.c */ +extern void software_suspend (void ); +extern void software_resume (void ); + +extern int register_suspend_notifier (struct notifier_block *); +extern int unregister_suspend_notifier (struct notifier_block *); + extern unsigned int nr_copy_pages __nosavedata; extern suspend_pagedir_t *pagedir_nosave __nosavedata; +/* Communication between kernel/suspend.c and arch/i386/suspend.c */ + +extern void do_magic_resume_1 (void ); +extern void do_magic_resume_2 (void ); +extern void do_magic_suspend_1 (void ); +extern void do_magic_suspend_2 (void ); +/* Communication between acpi and arch/i386/suspend.c */ extern void do_suspend_lowlevel (int resume);extern void do_suspend_lowlevel_s4bios (int resume);#else /* CONFIG_SOFTWARE_SUSPEND */ -static inline int software_suspend (void ) +static inline void software_suspend (void ) { +printk ("Warning: fake suspend called\n" );return -EPERM ; } +#define software_resume () do { } while(0) +#define register_suspend_notifier (a) do { } while(0) +#define unregister_suspend_notifier (a) do { } while(0)#endif /* CONFIG_SOFTWARE_SUSPEND */ #ifdef CONFIG_PM extern void refrigerator (unsigned long ); +extern int freeze_processes (void ); +extern void thaw_processes (void ); + +extern int pm_prepare_console (void ); +extern void pm_restore_console (void );#else static inline void refrigerator (unsigned long flag) { } +static inline int freeze_processes (void ) +{ +return 0 ; +} +static inline void thaw_processes (void ) +{ + +}#endif /* CONFIG_PM */ #endif /* _LINUX_SWSUSP_H */
kernel/sys.c +5 -2
@@ -456,8 +456,11 @@#ifdef CONFIG_SOFTWARE_SUSPEND case LINUX_REBOOT_CMD_SW_SUSPEND : -if (!pm_suspend (PM_SUSPEND_DISK )) -break ; +if (!software_suspend_enabled) { +unlock_kernel (); +return -EAGAIN ; + } +software_suspend ();do_exit (0 );break ;#endif
Signature · 2 lines
When do you have a heart between your knees? [Johanka's followup: and *two* hearts?]