PM: Introduce suspend notifiers (rev. 3)
Subsystems (2)
PATCH 1/1 PM: Introduce suspend notifiers (rev. 3)
Hi,
Last time there were some compilation problems with it, hopefully fixed now.
---
From: Rafael J. Wysocki <[email protected]>
Make it possible to register suspend notifiers so that subsystems can perform suspend-related operations that should not be carried out by device drivers' .suspend() and .resume() routines.
Signed-off-by Rafael J. Wysocki <[email protected]>
--- Documentation/power/suspend-notifiers.txt | 48 ++++++++++++++++++++++++++++ include/linux/notifier.h | 6 +++ include/linux/suspend.h | 19 +++++++++++ kernel/power/Makefile | 2 - kernel/power/disk.c | 23 ++++++++++++- kernel/power/main.c | 16 ++++++++- kernel/power/notify.c | 51 ++++++++++++++++++++++++++++++ kernel/power/power.h | 3 + kernel/power/user.c | 45 ++++++++++++++++++++------ 9 files changed, 199 insertions(+), 14 deletions(-)
kernel/power/notify.c new file +51 -0
@@ -0,0 +1,51 @@ +/* +* linux/kernel/power/notify.c +* +* This file contains functions used for registering and calling suspend +* notifiers that can be used by subsystems for carrying out some special +* suspend-related operations. +* +* Copyright (C) 2007 Rafael J. Wysocki <[email protected]> +* +* This file is released under the GPLv2. +* +*/ + +#include <linux/smp.h> +#include <linux/notifier.h> +#include <linux/module.h> +#include <linux/suspend.h> + +static DEFINE_MUTEX (suspend_notifier_lock); + +static RAW_NOTIFIER_HEAD (suspend_chain); + +int register_suspend_notifier (struct notifier_block *nb) +{ +int ret; +mutex_lock (&suspend_notifier_lock); + ret =raw_notifier_chain_register (&suspend_chain, nb); +mutex_unlock (&suspend_notifier_lock); +return ret; +} +EXPORT_SYMBOL (register_suspend_notifier); + +void unregister_suspend_notifier (struct notifier_block *nb) +{ +mutex_lock (&suspend_notifier_lock); +raw_notifier_chain_unregister (&suspend_chain, nb); +mutex_unlock (&suspend_notifier_lock); +} +EXPORT_SYMBOL (unregister_suspend_notifier); + +int suspend_notifier_call_chain (unsigned long val) +{ +int error =0 ; + +mutex_lock (&suspend_notifier_lock); +if (raw_notifier_call_chain (&suspend_chain, val,NULL ) ==NOTIFY_BAD ) + error = -EINVAL ; + +mutex_unlock (&suspend_notifier_lock); +return error; +}
include/linux/suspend.h +19 -0
@@ -52,4 +52,23 @@ struct saved_context;void __save_processor_state (struct saved_context *ctxt);void __restore_processor_state (struct saved_context *ctxt); +#ifdef CONFIG_PM +int register_suspend_notifier (struct notifier_block *nb); +void unregister_suspend_notifier (struct notifier_block *nb); + +#define suspend_notifier (fn, pri) { \ + static struct notifier_block fn##_nb = \ + { .notifier_call = fn, .priority = pri }; \ + register_suspend_notifier(&fn##_nb); \ +} +#else /* CONFIG_PM */ +static inline int register_suspend_notifier (struct notifier_block *nb) { +return 0 ; +} +static inline void unregister_suspend_notifier (struct notifier_block *nb) { +} + +#define suspend_notifier (fn, pri) do { (void)(fn); } while (0) +#endif /* CONFIG_PM */ +#endif /* _LINUX_SWSUSP_H */
kernel/power/Makefile +1 -1
@@ -3,7 +3,7 @@ ifeq ($(CONFIG_PM_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif -obj-y := main.o process.o console.o +obj-y := main.o process.o console.o notify.o obj-$(CONFIG_PM_LEGACY) += pm.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o disk.o snapshot.o swap.o user.o
kernel/power/power.h +3 -0
@@ -170,3 +170,6 @@ extern int suspend_enter(suspend_state_tstruct timeval ;extern void swsusp_show_speed (struct timeval *,struct timeval *,unsigned int ,char *); + +/* kernel/power/notify.c */ +extern int suspend_notifier_call_chain (unsigned long val);
include/linux/notifier.h +6 -0
@@ -209,5 +209,11 @@ extern int __srcu_notifier_call_chain(st#define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)#define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN) +#define SUSPEND_PREPARE 0x0002/* Going to freeze tasks */ +#define SUSPEND_ENTER_PREPARE 0x0003/* Tasks are frozen, we are suspending */ +#define SUSPEND_THAW_PREPARE 0x0004/* Going to thaw frozen tasks */ +#define SUSPEND_FINISHED 0x0005/* Tasks have been thawed */ +#define SUSPEND_RESTORE_PREPARE 0x0006/* STD restore is going to happen */ +#endif /* __KERNEL__ */ #endif /* _LINUX_NOTIFIER_H */
kernel/power/disk.c +22 -1
@@ -139,10 +139,18 @@ int pm_suspend_disk(void)if (error) goto Exit; + error =suspend_notifier_call_chain (SUSPEND_PREPARE ); +if (error) + goto Finish; + error =prepare_processes ();if (error) goto Finish; + error =suspend_notifier_call_chain (SUSPEND_ENTER_PREPARE ); +if (error) + goto Thaw; +if (pm_disk_mode ==PM_DISK_TESTPROC ) {printk ("swsusp debug: Waiting for 5 seconds.\n" );mdelay (5000 );
@@ -205,8 +213,10 @@ int pm_suspend_disk(void)device_resume ();resume_console (); Thaw: +suspend_notifier_call_chain (SUSPEND_THAW_PREPARE );unprepare_processes (); Finish: +suspend_notifier_call_chain (SUSPEND_FINISHED );free_basic_memory_bitmaps (); Exit:atomic_inc (&snapshot_device_available);
@@ -267,6 +277,10 @@ static int software_resume(void)if (error) goto Finish; + error =suspend_notifier_call_chain (SUSPEND_PREPARE ); +if (error) + goto Done; +pr_debug ("PM: Preparing processes for restore.\n" ); error =prepare_processes ();if (error) {
@@ -279,9 +293,13 @@ static int software_resume(void) error =swsusp_read ();if (error) {swsusp_free (); - goto Thaw; + goto Unprepare; } + error =suspend_notifier_call_chain (SUSPEND_RESTORE_PREPARE ); +if (error) + goto Thaw; +pr_debug ("PM: Preparing devices for restore.\n" );suspend_console ();
@@ -299,9 +317,12 @@ static int software_resume(void)device_resume ();resume_console (); Thaw: +suspend_notifier_call_chain (SUSPEND_THAW_PREPARE ); + Unprepare:printk (KERN_ERR "PM: Restore failed, recovering.\n" );unprepare_processes (); Done: +suspend_notifier_call_chain (SUSPEND_FINISHED );free_basic_memory_bitmaps (); Finish:atomic_inc (&snapshot_device_available);
kernel/power/main.c +15 -1
@@ -86,11 +86,20 @@ static int suspend_prepare(suspend_statepm_prepare_console (); + error =suspend_notifier_call_chain (SUSPEND_PREPARE ); +if (error) + goto Finish; +if (freeze_processes ()) { error = -EAGAIN ; - goto Thaw; +thaw_processes (); + goto Finish; } + error =suspend_notifier_call_chain (SUSPEND_ENTER_PREPARE ); +if (error) + goto Thaw; +if ((free_pages =global_page_state (NR_FREE_PAGES )) <FREE_PAGE_NUMBER ) {pr_debug ("PM: free some memory\n" );
@@ -123,8 +132,11 @@ static int suspend_prepare(suspend_statedevice_resume ();resume_console (); Thaw: +suspend_notifier_call_chain (SUSPEND_THAW_PREPARE );thaw_processes (); + Finish:pm_restore_console (); +suspend_notifier_call_chain (SUSPEND_FINISHED );return error; }
@@ -172,8 +184,10 @@ static void suspend_finish(suspend_statepm_finish (state);device_resume ();resume_console (); +suspend_notifier_call_chain (SUSPEND_THAW_PREPARE );thaw_processes ();pm_restore_console (); +suspend_notifier_call_chain (SUSPEND_FINISHED ); }
kernel/power/user.c +34 -11
107 lines not on this page · raw message
Documentation/power/suspend-notifiers.txt new file +48 -0
48 lines not on this page · raw message