string: factorize skip_spaces and export it to be generally available
[safe/jmp/linux-2.6] / kernel / power / main.c
index d9bba45..0998c71 100644 (file)
@@ -8,19 +8,10 @@
  *
  */
 
-#include <linux/module.h>
-#include <linux/suspend.h>
 #include <linux/kobject.h>
 #include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/console.h>
-#include <linux/cpu.h>
 #include <linux/resume-trace.h>
-#include <linux/freezer.h>
-#include <linux/vmstat.h>
-#include <linux/syscalls.h>
+#include <linux/workqueue.h>
 
 #include "power.h"
 
@@ -56,16 +47,6 @@ int pm_notifier_call_chain(unsigned long val)
 #ifdef CONFIG_PM_DEBUG
 int pm_test_level = TEST_NONE;
 
-static int suspend_test(int level)
-{
-       if (pm_test_level == level) {
-               printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
-               mdelay(5000);
-               return 1;
-       }
-       return 0;
-}
-
 static const char * const pm_tests[__TEST_AFTER_LAST] = {
        [TEST_NONE] = "none",
        [TEST_CORE] = "core",
@@ -124,277 +105,10 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
 }
 
 power_attr(pm_test);
-#else /* !CONFIG_PM_DEBUG */
-static inline int suspend_test(int level) { return 0; }
-#endif /* !CONFIG_PM_DEBUG */
+#endif /* CONFIG_PM_DEBUG */
 
 #endif /* CONFIG_PM_SLEEP */
 
-#ifdef CONFIG_SUSPEND
-
-/* This is just an arbitrary number */
-#define FREE_PAGE_NUMBER (100)
-
-static struct platform_suspend_ops *suspend_ops;
-
-/**
- *     suspend_set_ops - Set the global suspend method table.
- *     @ops:   Pointer to ops structure.
- */
-
-void suspend_set_ops(struct platform_suspend_ops *ops)
-{
-       mutex_lock(&pm_mutex);
-       suspend_ops = ops;
-       mutex_unlock(&pm_mutex);
-}
-
-/**
- * suspend_valid_only_mem - generic memory-only valid callback
- *
- * Platform 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 suspend_valid_only_mem(suspend_state_t state)
-{
-       return state == PM_SUSPEND_MEM;
-}
-
-/**
- *     suspend_prepare - Do prep work before entering low-power state.
- *
- *     This is common code that is called for each state that we're entering.
- *     Run suspend notifiers, allocate a console and stop all processes.
- */
-static int suspend_prepare(void)
-{
-       int error;
-       unsigned int free_pages;
-
-       if (!suspend_ops || !suspend_ops->enter)
-               return -EPERM;
-
-       error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
-       if (error)
-               goto Finish;
-
-       pm_prepare_console();
-
-       if (freeze_processes()) {
-               error = -EAGAIN;
-               goto Thaw;
-       }
-
-       free_pages = global_page_state(NR_FREE_PAGES);
-       if (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");
-               }
-       }
-       if (!error)
-               return 0;
-
- Thaw:
-       thaw_processes();
-       pm_restore_console();
- Finish:
-       pm_notifier_call_chain(PM_POST_SUSPEND);
-       return error;
-}
-
-/* default implementation */
-void __attribute__ ((weak)) arch_suspend_disable_irqs(void)
-{
-       local_irq_disable();
-}
-
-/* default implementation */
-void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
-{
-       local_irq_enable();
-}
-
-/**
- *     suspend_enter - enter the desired system sleep state.
- *     @state:         state to enter
- *
- *     This function should be called after devices have been suspended.
- */
-static int suspend_enter(suspend_state_t state)
-{
-       int error = 0;
-
-       arch_suspend_disable_irqs();
-       BUG_ON(!irqs_disabled());
-
-       if ((error = device_power_down(PMSG_SUSPEND))) {
-               printk(KERN_ERR "PM: Some devices failed to power down\n");
-               goto Done;
-       }
-
-       if (!suspend_test(TEST_CORE))
-               error = suspend_ops->enter(state);
-
-       device_power_up();
- Done:
-       arch_suspend_enable_irqs();
-       BUG_ON(irqs_disabled());
-       return error;
-}
-
-/**
- *     suspend_devices_and_enter - suspend devices and enter the desired system
- *                                 sleep state.
- *     @state:           state to enter
- */
-int suspend_devices_and_enter(suspend_state_t state)
-{
-       int error;
-
-       if (!suspend_ops)
-               return -ENOSYS;
-
-       if (suspend_ops->begin) {
-               error = suspend_ops->begin(state);
-               if (error)
-                       goto Close;
-       }
-       suspend_console();
-       error = device_suspend(PMSG_SUSPEND);
-       if (error) {
-               printk(KERN_ERR "PM: Some devices failed to suspend\n");
-               goto Resume_console;
-       }
-
-       if (suspend_test(TEST_DEVICES))
-               goto Resume_devices;
-
-       if (suspend_ops->prepare) {
-               error = suspend_ops->prepare();
-               if (error)
-                       goto Resume_devices;
-       }
-
-       if (suspend_test(TEST_PLATFORM))
-               goto Finish;
-
-       error = disable_nonboot_cpus();
-       if (!error && !suspend_test(TEST_CPUS))
-               suspend_enter(state);
-
-       enable_nonboot_cpus();
- Finish:
-       if (suspend_ops->finish)
-               suspend_ops->finish();
- Resume_devices:
-       device_resume();
- Resume_console:
-       resume_console();
- Close:
-       if (suspend_ops->end)
-               suspend_ops->end();
-       return error;
-}
-
-/**
- *     suspend_finish - Do final work before exiting suspend sequence.
- *
- *     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(void)
-{
-       thaw_processes();
-       pm_restore_console();
-       pm_notifier_call_chain(PM_POST_SUSPEND);
-}
-
-
-
-
-static const char * const pm_states[PM_SUSPEND_MAX] = {
-       [PM_SUSPEND_STANDBY]    = "standby",
-       [PM_SUSPEND_MEM]        = "mem",
-};
-
-static inline int valid_state(suspend_state_t state)
-{
-       /* All states need lowlevel support and need to be valid
-        * to the lowlevel implementation, no valid callback
-        * implies that none are valid. */
-       if (!suspend_ops || !suspend_ops->valid || !suspend_ops->valid(state))
-               return 0;
-       return 1;
-}
-
-
-/**
- *     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)
-{
-       int error;
-
-       if (!valid_state(state))
-               return -ENODEV;
-
-       if (!mutex_trylock(&pm_mutex))
-               return -EBUSY;
-
-       printk(KERN_INFO "PM: Syncing filesystems ... ");
-       sys_sync();
-       printk("done.\n");
-
-       pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
-       error = suspend_prepare();
-       if (error)
-               goto Unlock;
-
-       if (suspend_test(TEST_FREEZER))
-               goto Finish;
-
-       pr_debug("PM: Entering %s sleep\n", pm_states[state]);
-       error = suspend_devices_and_enter(state);
-
- Finish:
-       pr_debug("PM: Finishing wakeup.\n");
-       suspend_finish();
- Unlock:
-       mutex_unlock(&pm_mutex);
-       return error;
-}
-
-
-/**
- *     pm_suspend - Externally visible function for suspending system.
- *     @state:         Enumerated 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)
-{
-       if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
-               return enter_state(state);
-       return -EINVAL;
-}
-
-EXPORT_SYMBOL(pm_suspend);
-
-#endif /* CONFIG_SUSPEND */
-
 struct kobject *power_kobj;
 
 /**
@@ -407,7 +121,6 @@ struct kobject *power_kobj;
  *     store() accepts one of those strings, translates it into the 
  *     proper enumerated value, and initiates a suspend transition.
  */
-
 static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
                          char *buf)
 {
@@ -505,9 +218,25 @@ 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 = create_freezeable_workqueue("pm");
+
+       return pm_wq ? 0 : -ENOMEM;
+}
+#else
+static inline int pm_start_workqueue(void) { return 0; }
+#endif
 
 static int __init pm_init(void)
 {
+       int error = pm_start_workqueue();
+       if (error)
+               return error;
        power_kobj = kobject_create_and_add("power", NULL);
        if (!power_kobj)
                return -ENOMEM;