PM / Sleep: Add user space interface for manipulating wakeup sources, v3
[linux-2.6.git] / kernel / power / main.c
index b21c2a5..54ec071 100644 (file)
  *
  * Copyright (c) 2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Lab
- * 
+ *
  * This file is released under the GPLv2
  *
  */
 
-#include <linux/module.h>
-#include <linux/suspend.h>
+#include <linux/export.h>
 #include <linux/kobject.h>
 #include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/pm.h>
-#include <linux/console.h>
-#include <linux/cpu.h>
 #include <linux/resume-trace.h>
-#include <linux/freezer.h>
-#include <linux/vmstat.h>
+#include <linux/workqueue.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
 
 #include "power.h"
 
-/*This is just an arbitrary number */
-#define FREE_PAGE_NUMBER (100)
-
 DEFINE_MUTEX(pm_mutex);
 
-struct pm_ops *pm_ops;
-suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN;
+#ifdef CONFIG_PM_SLEEP
 
-/**
- *     pm_set_ops - Set the global power method table. 
- *     @ops:   Pointer to ops structure.
- */
+/* Routines for PM-transition notifications */
+
+static BLOCKING_NOTIFIER_HEAD(pm_chain_head);
 
-void pm_set_ops(struct pm_ops * ops)
+int register_pm_notifier(struct notifier_block *nb)
 {
-       mutex_lock(&pm_mutex);
-       pm_ops = ops;
-       if (ops && ops->pm_disk_mode != PM_DISK_INVALID) {
-               pm_disk_mode = ops->pm_disk_mode;
-       } else
-               pm_disk_mode = PM_DISK_SHUTDOWN;
-       mutex_unlock(&pm_mutex);
+       return blocking_notifier_chain_register(&pm_chain_head, nb);
 }
+EXPORT_SYMBOL_GPL(register_pm_notifier);
 
-/**
- * pm_valid_only_mem - generic memory-only valid callback
- *
- * pm_ops drivers that implement mem suspend only and only need
- * to check for that in their .valid callback can use this instead
- * of rolling their own .valid callback.
- */
-int pm_valid_only_mem(suspend_state_t state)
+int unregister_pm_notifier(struct notifier_block *nb)
 {
-       return state == PM_SUSPEND_MEM;
+       return blocking_notifier_chain_unregister(&pm_chain_head, nb);
 }
+EXPORT_SYMBOL_GPL(unregister_pm_notifier);
 
-
-static inline void pm_finish(suspend_state_t state)
+int pm_notifier_call_chain(unsigned long val)
 {
-       if (pm_ops->finish)
-               pm_ops->finish(state);
+       int ret = blocking_notifier_call_chain(&pm_chain_head, val, NULL);
+
+       return notifier_to_errno(ret);
 }
 
-/**
- *     suspend_prepare - Do prep work before entering low-power state.
- *     @state:         State we're entering.
- *
- *     This is common code that is called for each state that we're 
- *     entering. Allocate a console, stop all processes, then make sure
- *     the platform can enter the requested state.
- */
+/* If set, devices may be suspended and resumed asynchronously. */
+int pm_async_enabled = 1;
 
-static int suspend_prepare(suspend_state_t state)
+static ssize_t pm_async_show(struct kobject *kobj, struct kobj_attribute *attr,
+                            char *buf)
 {
-       int error;
-       unsigned int free_pages;
-
-       if (!pm_ops || !pm_ops->enter)
-               return -EPERM;
-
-       pm_prepare_console();
+       return sprintf(buf, "%d\n", pm_async_enabled);
+}
 
-       if (freeze_processes()) {
-               error = -EAGAIN;
-               goto Thaw;
-       }
+static ssize_t pm_async_store(struct kobject *kobj, struct kobj_attribute *attr,
+                             const char *buf, size_t n)
+{
+       unsigned long val;
 
-       if ((free_pages = global_page_state(NR_FREE_PAGES))
-                       < FREE_PAGE_NUMBER) {
-               pr_debug("PM: free some memory\n");
-               shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
-               if (nr_free_pages() < FREE_PAGE_NUMBER) {
-                       error = -ENOMEM;
-                       printk(KERN_ERR "PM: No enough memory\n");
-                       goto Thaw;
-               }
-       }
+       if (strict_strtoul(buf, 10, &val))
+               return -EINVAL;
 
-       if (pm_ops->prepare) {
-               if ((error = pm_ops->prepare(state)))
-                       goto Thaw;
-       }
+       if (val > 1)
+               return -EINVAL;
 
-       suspend_console();
-       error = device_suspend(PMSG_SUSPEND);
-       if (error) {
-               printk(KERN_ERR "Some devices failed to suspend\n");
-               goto Resume_devices;
-       }
-       error = disable_nonboot_cpus();
-       if (!error)
-               return 0;
-
-       enable_nonboot_cpus();
- Resume_devices:
-       pm_finish(state);
-       device_resume();
-       resume_console();
- Thaw:
-       thaw_processes();
-       pm_restore_console();
-       return error;
+       pm_async_enabled = val;
+       return n;
 }
 
-/* default implementation */
-void __attribute__ ((weak)) arch_suspend_disable_irqs(void)
-{
-       local_irq_disable();
-}
+power_attr(pm_async);
 
-/* default implementation */
-void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
-{
-       local_irq_enable();
-}
+#ifdef CONFIG_PM_DEBUG
+int pm_test_level = TEST_NONE;
 
-int suspend_enter(suspend_state_t state)
+static const char * const pm_tests[__TEST_AFTER_LAST] = {
+       [TEST_NONE] = "none",
+       [TEST_CORE] = "core",
+       [TEST_CPUS] = "processors",
+       [TEST_PLATFORM] = "platform",
+       [TEST_DEVICES] = "devices",
+       [TEST_FREEZER] = "freezer",
+};
+
+static ssize_t pm_test_show(struct kobject *kobj, struct kobj_attribute *attr,
+                               char *buf)
 {
-       int error = 0;
+       char *s = buf;
+       int level;
+
+       for (level = TEST_FIRST; level <= TEST_MAX; level++)
+               if (pm_tests[level]) {
+                       if (level == pm_test_level)
+                               s += sprintf(s, "[%s] ", pm_tests[level]);
+                       else
+                               s += sprintf(s, "%s ", pm_tests[level]);
+               }
 
-       arch_suspend_disable_irqs();
-       BUG_ON(!irqs_disabled());
+       if (s != buf)
+               /* convert the last space to a newline */
+               *(s-1) = '\n';
 
-       if ((error = device_power_down(PMSG_SUSPEND))) {
-               printk(KERN_ERR "Some devices failed to power down\n");
-               goto Done;
-       }
-       error = pm_ops->enter(state);
-       device_power_up();
- Done:
-       arch_suspend_enable_irqs();
-       BUG_ON(irqs_disabled());
-       return error;
+       return (s - buf);
 }
 
-
-/**
- *     suspend_finish - Do final work before exiting suspend sequence.
- *     @state:         State we're coming out of.
- *
- *     Call platform code to clean up, restart processes, and free the 
- *     console that we've allocated. This is not called for suspend-to-disk.
- */
-
-static void suspend_finish(suspend_state_t state)
+static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
+                               const char *buf, size_t n)
 {
-       enable_nonboot_cpus();
-       pm_finish(state);
-       device_resume();
-       resume_console();
-       thaw_processes();
-       pm_restore_console();
-}
+       const char * const *s;
+       int level;
+       char *p;
+       int len;
+       int error = -EINVAL;
 
+       p = memchr(buf, '\n', n);
+       len = p ? p - buf : n;
 
+       lock_system_sleep();
 
+       level = TEST_FIRST;
+       for (s = &pm_tests[level]; level <= TEST_MAX; s++, level++)
+               if (*s && len == strlen(*s) && !strncmp(buf, *s, len)) {
+                       pm_test_level = level;
+                       error = 0;
+                       break;
+               }
 
-static const char * const pm_states[PM_SUSPEND_MAX] = {
-       [PM_SUSPEND_STANDBY]    = "standby",
-       [PM_SUSPEND_MEM]        = "mem",
-#ifdef CONFIG_SOFTWARE_SUSPEND
-       [PM_SUSPEND_DISK]       = "disk",
-#endif
-};
+       unlock_system_sleep();
 
-static inline int valid_state(suspend_state_t state)
-{
-       /* Suspend-to-disk does not really need low-level support.
-        * It can work with reboot if needed. */
-       if (state == PM_SUSPEND_DISK)
-               return 1;
-
-       /* all other states need lowlevel support and need to be
-        * valid to the lowlevel implementation, no valid callback
-        * implies that none are valid. */
-       if (!pm_ops || !pm_ops->valid || !pm_ops->valid(state))
-               return 0;
-       return 1;
+       return error ? error : n;
 }
 
+power_attr(pm_test);
+#endif /* CONFIG_PM_DEBUG */
 
-/**
- *     enter_state - Do common work of entering low-power state.
- *     @state:         pm_state structure for state we're entering.
- *
- *     Make sure we're the only ones trying to enter a sleep state. Fail
- *     if someone has beat us to it, since we don't want anything weird to
- *     happen when we wake up.
- *     Then, do the setup for suspend, enter the state, and cleaup (after
- *     we've woken up).
- */
-
-static int enter_state(suspend_state_t state)
+#ifdef CONFIG_DEBUG_FS
+static char *suspend_step_name(enum suspend_stat_step step)
 {
-       int error;
-
-       if (!valid_state(state))
-               return -ENODEV;
-       if (!mutex_trylock(&pm_mutex))
-               return -EBUSY;
-
-       if (state == PM_SUSPEND_DISK) {
-               error = pm_suspend_disk();
-               goto Unlock;
+       switch (step) {
+       case SUSPEND_FREEZE:
+               return "freeze";
+       case SUSPEND_PREPARE:
+               return "prepare";
+       case SUSPEND_SUSPEND:
+               return "suspend";
+       case SUSPEND_SUSPEND_NOIRQ:
+               return "suspend_noirq";
+       case SUSPEND_RESUME_NOIRQ:
+               return "resume_noirq";
+       case SUSPEND_RESUME:
+               return "resume";
+       default:
+               return "";
        }
+}
 
-       pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
-       if ((error = suspend_prepare(state)))
-               goto Unlock;
-
-       pr_debug("PM: Entering %s sleep\n", pm_states[state]);
-       error = suspend_enter(state);
+static int suspend_stats_show(struct seq_file *s, void *unused)
+{
+       int i, index, last_dev, last_errno, last_step;
+
+       last_dev = suspend_stats.last_failed_dev + REC_FAILED_NUM - 1;
+       last_dev %= REC_FAILED_NUM;
+       last_errno = suspend_stats.last_failed_errno + REC_FAILED_NUM - 1;
+       last_errno %= REC_FAILED_NUM;
+       last_step = suspend_stats.last_failed_step + REC_FAILED_NUM - 1;
+       last_step %= REC_FAILED_NUM;
+       seq_printf(s, "%s: %d\n%s: %d\n%s: %d\n%s: %d\n%s: %d\n"
+                       "%s: %d\n%s: %d\n%s: %d\n%s: %d\n%s: %d\n",
+                       "success", suspend_stats.success,
+                       "fail", suspend_stats.fail,
+                       "failed_freeze", suspend_stats.failed_freeze,
+                       "failed_prepare", suspend_stats.failed_prepare,
+                       "failed_suspend", suspend_stats.failed_suspend,
+                       "failed_suspend_late",
+                               suspend_stats.failed_suspend_late,
+                       "failed_suspend_noirq",
+                               suspend_stats.failed_suspend_noirq,
+                       "failed_resume", suspend_stats.failed_resume,
+                       "failed_resume_early",
+                               suspend_stats.failed_resume_early,
+                       "failed_resume_noirq",
+                               suspend_stats.failed_resume_noirq);
+       seq_printf(s,   "failures:\n  last_failed_dev:\t%-s\n",
+                       suspend_stats.failed_devs[last_dev]);
+       for (i = 1; i < REC_FAILED_NUM; i++) {
+               index = last_dev + REC_FAILED_NUM - i;
+               index %= REC_FAILED_NUM;
+               seq_printf(s, "\t\t\t%-s\n",
+                       suspend_stats.failed_devs[index]);
+       }
+       seq_printf(s,   "  last_failed_errno:\t%-d\n",
+                       suspend_stats.errno[last_errno]);
+       for (i = 1; i < REC_FAILED_NUM; i++) {
+               index = last_errno + REC_FAILED_NUM - i;
+               index %= REC_FAILED_NUM;
+               seq_printf(s, "\t\t\t%-d\n",
+                       suspend_stats.errno[index]);
+       }
+       seq_printf(s,   "  last_failed_step:\t%-s\n",
+                       suspend_step_name(
+                               suspend_stats.failed_steps[last_step]));
+       for (i = 1; i < REC_FAILED_NUM; i++) {
+               index = last_step + REC_FAILED_NUM - i;
+               index %= REC_FAILED_NUM;
+               seq_printf(s, "\t\t\t%-s\n",
+                       suspend_step_name(
+                               suspend_stats.failed_steps[index]));
+       }
 
-       pr_debug("PM: Finishing wakeup.\n");
-       suspend_finish(state);
- Unlock:
-       mutex_unlock(&pm_mutex);
-       return error;
+       return 0;
 }
 
-/*
- * This is main interface to the outside world. It needs to be
- * called from process context.
- */
-int software_suspend(void)
+static int suspend_stats_open(struct inode *inode, struct file *file)
 {
-       return enter_state(PM_SUSPEND_DISK);
+       return single_open(file, suspend_stats_show, NULL);
 }
 
+static const struct file_operations suspend_stats_operations = {
+       .open           = suspend_stats_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
 
-/**
- *     pm_suspend - Externally visible function for suspending system.
- *     @state:         Enumarted value of state to enter.
- *
- *     Determine whether or not value is within range, get state 
- *     structure, and enter (above).
- */
-
-int pm_suspend(suspend_state_t state)
+static int __init pm_debugfs_init(void)
 {
-       if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
-               return enter_state(state);
-       return -EINVAL;
+       debugfs_create_file("suspend_stats", S_IFREG | S_IRUGO,
+                       NULL, NULL, &suspend_stats_operations);
+       return 0;
 }
 
-EXPORT_SYMBOL(pm_suspend);
+late_initcall(pm_debugfs_init);
+#endif /* CONFIG_DEBUG_FS */
 
-decl_subsys(power,NULL,NULL);
+#endif /* CONFIG_PM_SLEEP */
 
+struct kobject *power_kobj;
 
 /**
  *     state - control system power state.
@@ -281,57 +244,244 @@ decl_subsys(power,NULL,NULL);
  *     'standby' (Power-On Suspend), 'mem' (Suspend-to-RAM), and
  *     'disk' (Suspend-to-Disk).
  *
- *     store() accepts one of those strings, translates it into the 
+ *     store() accepts one of those strings, translates it into the
  *     proper enumerated value, and initiates a suspend transition.
  */
-
-static ssize_t state_show(struct kset *kset, char *buf)
+static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
+                         char *buf)
 {
+       char *s = buf;
+#ifdef CONFIG_SUSPEND
        int i;
-       char * s = buf;
 
        for (i = 0; i < PM_SUSPEND_MAX; i++) {
                if (pm_states[i] && valid_state(i))
                        s += sprintf(s,"%s ", pm_states[i]);
        }
-       s += sprintf(s,"\n");
+#endif
+#ifdef CONFIG_HIBERNATION
+       s += sprintf(s, "%s\n", "disk");
+#else
+       if (s != buf)
+               /* convert the last space to a newline */
+               *(s-1) = '\n';
+#endif
        return (s - buf);
 }
 
-static ssize_t state_store(struct kset *kset, const char *buf, size_t n)
+static suspend_state_t decode_state(const char *buf, size_t n)
 {
+#ifdef CONFIG_SUSPEND
        suspend_state_t state = PM_SUSPEND_STANDBY;
        const char * const *s;
+#endif
        char *p;
-       int error;
        int len;
 
        p = memchr(buf, '\n', n);
        len = p ? p - buf : n;
 
-       for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++) {
-               if (*s && !strncmp(buf, *s, len))
-                       break;
+       /* Check hibernation first. */
+       if (len == 4 && !strncmp(buf, "disk", len))
+               return PM_SUSPEND_MAX;
+
+#ifdef CONFIG_SUSPEND
+       for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++)
+               if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
+                       return state;
+#endif
+
+       return PM_SUSPEND_ON;
+}
+
+static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
+                          const char *buf, size_t n)
+{
+       suspend_state_t state;
+       int error;
+
+       error = pm_autosleep_lock();
+       if (error)
+               return error;
+
+       if (pm_autosleep_state() > PM_SUSPEND_ON) {
+               error = -EBUSY;
+               goto out;
        }
-       if (state < PM_SUSPEND_MAX && *s)
-               error = enter_state(state);
+
+       state = decode_state(buf, n);
+       if (state < PM_SUSPEND_MAX)
+               error = pm_suspend(state);
+       else if (state == PM_SUSPEND_MAX)
+               error = hibernate();
        else
                error = -EINVAL;
+
+ out:
+       pm_autosleep_unlock();
        return error ? error : n;
 }
 
 power_attr(state);
 
+#ifdef CONFIG_PM_SLEEP
+/*
+ * The 'wakeup_count' attribute, along with the functions defined in
+ * drivers/base/power/wakeup.c, provides a means by which wakeup events can be
+ * handled in a non-racy way.
+ *
+ * If a wakeup event occurs when the system is in a sleep state, it simply is
+ * woken up.  In turn, if an event that would wake the system up from a sleep
+ * state occurs when it is undergoing a transition to that sleep state, the
+ * transition should be aborted.  Moreover, if such an event occurs when the
+ * system is in the working state, an attempt to start a transition to the
+ * given sleep state should fail during certain period after the detection of
+ * the event.  Using the 'state' attribute alone is not sufficient to satisfy
+ * these requirements, because a wakeup event may occur exactly when 'state'
+ * is being written to and may be delivered to user space right before it is
+ * frozen, so the event will remain only partially processed until the system is
+ * woken up by another event.  In particular, it won't cause the transition to
+ * a sleep state to be aborted.
+ *
+ * This difficulty may be overcome if user space uses 'wakeup_count' before
+ * writing to 'state'.  It first should read from 'wakeup_count' and store
+ * the read value.  Then, after carrying out its own preparations for the system
+ * transition to a sleep state, it should write the stored value to
+ * 'wakeup_count'.  If that fails, at least one wakeup event has occurred since
+ * 'wakeup_count' was read and 'state' should not be written to.  Otherwise, it
+ * is allowed to write to 'state', but the transition will be aborted if there
+ * are any wakeup events detected after 'wakeup_count' was written to.
+ */
+
+static ssize_t wakeup_count_show(struct kobject *kobj,
+                               struct kobj_attribute *attr,
+                               char *buf)
+{
+       unsigned int val;
+
+       return pm_get_wakeup_count(&val, true) ?
+               sprintf(buf, "%u\n", val) : -EINTR;
+}
+
+static ssize_t wakeup_count_store(struct kobject *kobj,
+                               struct kobj_attribute *attr,
+                               const char *buf, size_t n)
+{
+       unsigned int val;
+       int error;
+
+       error = pm_autosleep_lock();
+       if (error)
+               return error;
+
+       if (pm_autosleep_state() > PM_SUSPEND_ON) {
+               error = -EBUSY;
+               goto out;
+       }
+
+       error = -EINVAL;
+       if (sscanf(buf, "%u", &val) == 1) {
+               if (pm_save_wakeup_count(val))
+                       error = n;
+       }
+
+ out:
+       pm_autosleep_unlock();
+       return error;
+}
+
+power_attr(wakeup_count);
+
+#ifdef CONFIG_PM_AUTOSLEEP
+static ssize_t autosleep_show(struct kobject *kobj,
+                             struct kobj_attribute *attr,
+                             char *buf)
+{
+       suspend_state_t state = pm_autosleep_state();
+
+       if (state == PM_SUSPEND_ON)
+               return sprintf(buf, "off\n");
+
+#ifdef CONFIG_SUSPEND
+       if (state < PM_SUSPEND_MAX)
+               return sprintf(buf, "%s\n", valid_state(state) ?
+                                               pm_states[state] : "error");
+#endif
+#ifdef CONFIG_HIBERNATION
+       return sprintf(buf, "disk\n");
+#else
+       return sprintf(buf, "error");
+#endif
+}
+
+static ssize_t autosleep_store(struct kobject *kobj,
+                              struct kobj_attribute *attr,
+                              const char *buf, size_t n)
+{
+       suspend_state_t state = decode_state(buf, n);
+       int error;
+
+       if (state == PM_SUSPEND_ON
+           && !(strncmp(buf, "off", 3) && strncmp(buf, "off\n", 4)))
+               return -EINVAL;
+
+       error = pm_autosleep_set_state(state);
+       return error ? error : n;
+}
+
+power_attr(autosleep);
+#endif /* CONFIG_PM_AUTOSLEEP */
+
+#ifdef CONFIG_PM_WAKELOCKS
+static ssize_t wake_lock_show(struct kobject *kobj,
+                             struct kobj_attribute *attr,
+                             char *buf)
+{
+       return pm_show_wakelocks(buf, true);
+}
+
+static ssize_t wake_lock_store(struct kobject *kobj,
+                              struct kobj_attribute *attr,
+                              const char *buf, size_t n)
+{
+       int error = pm_wake_lock(buf);
+       return error ? error : n;
+}
+
+power_attr(wake_lock);
+
+static ssize_t wake_unlock_show(struct kobject *kobj,
+                               struct kobj_attribute *attr,
+                               char *buf)
+{
+       return pm_show_wakelocks(buf, false);
+}
+
+static ssize_t wake_unlock_store(struct kobject *kobj,
+                                struct kobj_attribute *attr,
+                                const char *buf, size_t n)
+{
+       int error = pm_wake_unlock(buf);
+       return error ? error : n;
+}
+
+power_attr(wake_unlock);
+
+#endif /* CONFIG_PM_WAKELOCKS */
+#endif /* CONFIG_PM_SLEEP */
+
 #ifdef CONFIG_PM_TRACE
 int pm_trace_enabled;
 
-static ssize_t pm_trace_show(struct kset *kset, char *buf)
+static ssize_t pm_trace_show(struct kobject *kobj, struct kobj_attribute *attr,
+                            char *buf)
 {
        return sprintf(buf, "%d\n", pm_trace_enabled);
 }
 
 static ssize_t
-pm_trace_store(struct kset *kset, const char *buf, size_t n)
+pm_trace_store(struct kobject *kobj, struct kobj_attribute *attr,
+              const char *buf, size_t n)
 {
        int val;
 
@@ -344,29 +494,79 @@ pm_trace_store(struct kset *kset, const char *buf, size_t n)
 
 power_attr(pm_trace);
 
+static ssize_t pm_trace_dev_match_show(struct kobject *kobj,
+                                      struct kobj_attribute *attr,
+                                      char *buf)
+{
+       return show_trace_dev_match(buf, PAGE_SIZE);
+}
+
+static ssize_t
+pm_trace_dev_match_store(struct kobject *kobj, struct kobj_attribute *attr,
+                        const char *buf, size_t n)
+{
+       return -EINVAL;
+}
+
+power_attr(pm_trace_dev_match);
+
+#endif /* CONFIG_PM_TRACE */
+
 static struct attribute * g[] = {
        &state_attr.attr,
+#ifdef CONFIG_PM_TRACE
        &pm_trace_attr.attr,
+       &pm_trace_dev_match_attr.attr,
+#endif
+#ifdef CONFIG_PM_SLEEP
+       &pm_async_attr.attr,
+       &wakeup_count_attr.attr,
+#ifdef CONFIG_PM_AUTOSLEEP
+       &autosleep_attr.attr,
+#endif
+#ifdef CONFIG_PM_WAKELOCKS
+       &wake_lock_attr.attr,
+       &wake_unlock_attr.attr,
+#endif
+#ifdef CONFIG_PM_DEBUG
+       &pm_test_attr.attr,
+#endif
+#endif
        NULL,
 };
-#else
-static struct attribute * g[] = {
-       &state_attr.attr,
-       NULL,
-};
-#endif /* CONFIG_PM_TRACE */
 
 static struct attribute_group attr_group = {
        .attrs = g,
 };
 
+#ifdef CONFIG_PM_RUNTIME
+struct workqueue_struct *pm_wq;
+EXPORT_SYMBOL_GPL(pm_wq);
+
+static int __init pm_start_workqueue(void)
+{
+       pm_wq = alloc_workqueue("pm", WQ_FREEZABLE, 0);
+
+       return pm_wq ? 0 : -ENOMEM;
+}
+#else
+static inline int pm_start_workqueue(void) { return 0; }
+#endif
 
 static int __init pm_init(void)
 {
-       int error = subsystem_register(&power_subsys);
-       if (!error)
-               error = sysfs_create_group(&power_subsys.kobj,&attr_group);
-       return error;
+       int error = pm_start_workqueue();
+       if (error)
+               return error;
+       hibernate_image_size_init();
+       hibernate_reserved_size_init();
+       power_kobj = kobject_create_and_add("power", NULL);
+       if (!power_kobj)
+               return -ENOMEM;
+       error = sysfs_create_group(power_kobj, &attr_group);
+       if (error)
+               return error;
+       return pm_autosleep_init();
 }
 
 core_initcall(pm_init);