Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / base / power / suspend.c
index 19e660a..2a769cc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * suspend.c - Functions for putting devices to sleep. 
+ * suspend.c - Functions for putting devices to sleep.
  *
  * Copyright (c) 2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Labs
@@ -9,19 +9,20 @@
  */
 
 #include <linux/device.h>
+#include <linux/kallsyms.h>
+#include <linux/pm.h>
+#include "../base.h"
 #include "power.h"
-extern int sysdev_suspend(u32 state);
 
 /*
  * The entries in the dpm_active list are in a depth first order, simply
- * because children are guaranteed to be discovered after parents, and 
- * are inserted at the back of the list on discovery. 
- * 
+ * because children are guaranteed to be discovered after parents, and
+ * are inserted at the back of the list on discovery.
+ *
  * All list on the suspend path are done in reverse order, so we operate
  * on the leaves of the device tree (or forests, depending on how you want
- * to look at it ;) first. As nodes are removed from the back of the list, 
- * they are inserted into the front of their destintation lists. 
+ * to look at it ;) first. As nodes are removed from the back of the list,
+ * they are inserted into the front of their destintation lists.
  *
  * Things are the reverse on the resume path - iterations are done in
  * forward order, and nodes are inserted at the back of their destination
@@ -35,68 +36,104 @@ extern int sysdev_suspend(u32 state);
  *     @state: Power state device is entering.
  */
 
-int suspend_device(struct device * dev, u32 state)
+int suspend_device(struct device * dev, pm_message_t state)
 {
        int error = 0;
 
-       if (dev->bus && dev->bus->suspend)
-               error = dev->bus->suspend(dev,state);
+       down(&dev->sem);
+       if (dev->power.power_state.event) {
+               dev_dbg(dev, "PM: suspend %d-->%d\n",
+                       dev->power.power_state.event, state.event);
+       }
+       if (dev->power.pm_parent
+                       && dev->power.pm_parent->power.power_state.event) {
+               dev_err(dev,
+                       "PM: suspend %d->%d, parent %s already %d\n",
+                       dev->power.power_state.event, state.event,
+                       dev->power.pm_parent->bus_id,
+                       dev->power.pm_parent->power.power_state.event);
+       }
 
-       if (!error) {
-               list_del(&dev->power.entry);
-               list_add(&dev->power.entry,&dpm_off);
-       } else if (error == -EAGAIN) {
-               list_del(&dev->power.entry);
-               list_add(&dev->power.entry,&dpm_off_irq);
+       dev->power.prev_state = dev->power.power_state;
+
+       if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
+               dev_dbg(dev, "suspending\n");
+               error = dev->bus->suspend(dev, state);
+               suspend_report_result(dev->bus->suspend, error);
        }
+       up(&dev->sem);
        return error;
 }
 
 
 /**
  *     device_suspend - Save state and stop all devices in system.
- *     @state:         Power state to put each device in. 
+ *     @state:         Power state to put each device in.
  *
  *     Walk the dpm_active list, call ->suspend() for each device, and move
- *     it to dpm_off. 
+ *     it to dpm_off.
  *     Check the return value for each. If it returns 0, then we move the
- *     the device to the dpm_off list. If it returns -EAGAIN, we move it to 
- *     the dpm_off_irq list. If we get a different error, try and back out. 
+ *     the device to the dpm_off list. If it returns -EAGAIN, we move it to
+ *     the dpm_off_irq list. If we get a different error, try and back out.
  *
  *     If we hit a failure with any of the devices, call device_resume()
- *     above to bring the suspended devices back to life. 
- *
- *     Note this function leaves dpm_sem held to
- *     a) block other devices from registering.
- *     b) prevent other PM operations from happening after we've begun.
- *     c) make sure we're exclusive when we disable interrupts.
+ *     above to bring the suspended devices back to life.
  *
  */
 
-int device_suspend(u32 state)
+int device_suspend(pm_message_t state)
 {
        int error = 0;
 
        down(&dpm_sem);
-       while(!list_empty(&dpm_active)) {
+       down(&dpm_list_sem);
+       while (!list_empty(&dpm_active) && error == 0) {
                struct list_head * entry = dpm_active.prev;
                struct device * dev = to_device(entry);
-               if ((error = suspend_device(dev,state))) {
-                       if (error != -EAGAIN)
-                               goto Error;
-                       else
+
+               get_device(dev);
+               up(&dpm_list_sem);
+
+               error = suspend_device(dev, state);
+
+               down(&dpm_list_sem);
+
+               /* Check if the device got removed */
+               if (!list_empty(&dev->power.entry)) {
+                       /* Move it to the dpm_off or dpm_off_irq list */
+                       if (!error) {
+                               list_del(&dev->power.entry);
+                               list_add(&dev->power.entry, &dpm_off);
+                       } else if (error == -EAGAIN) {
+                               list_del(&dev->power.entry);
+                               list_add(&dev->power.entry, &dpm_off_irq);
                                error = 0;
+                       }
                }
+               if (error)
+                       printk(KERN_ERR "Could not suspend device %s: "
+                               "error %d\n", kobject_name(&dev->kobj), error);
+               put_device(dev);
+       }
+       up(&dpm_list_sem);
+       if (error) {
+               /* we failed... before resuming, bring back devices from
+                * dpm_off_irq list back to main dpm_off list, we do want
+                * to call resume() on them, in case they partially suspended
+                * despite returning -EAGAIN
+                */
+               while (!list_empty(&dpm_off_irq)) {
+                       struct list_head * entry = dpm_off_irq.next;
+                       list_del(entry);
+                       list_add(entry, &dpm_off);
+               }
+               dpm_resume();
        }
- Done:
        up(&dpm_sem);
        return error;
- Error:
-       dpm_resume();
-       goto Done;
 }
 
-EXPORT_SYMBOL(device_suspend);
+EXPORT_SYMBOL_GPL(device_suspend);
 
 
 /**
@@ -104,19 +141,19 @@ EXPORT_SYMBOL(device_suspend);
  *     @state:         Power state to enter.
  *
  *     Walk the dpm_off_irq list, calling ->power_down() for each device that
- *     couldn't power down the device with interrupts enabled. When we're 
- *     done, power down system devices. 
+ *     couldn't power down the device with interrupts enabled. When we're
+ *     done, power down system devices.
  */
 
-int device_power_down(u32 state)
+int device_power_down(pm_message_t state)
 {
        int error = 0;
        struct device * dev;
 
-       list_for_each_entry_reverse(dev,&dpm_off_irq,power.entry) {
-               if ((error = suspend_device(dev,state)))
+       list_for_each_entry_reverse(dev, &dpm_off_irq, power.entry) {
+               if ((error = suspend_device(dev, state)))
                        break;
-       } 
+       }
        if (error)
                goto Error;
        if ((error = sysdev_suspend(state)))
@@ -124,9 +161,20 @@ int device_power_down(u32 state)
  Done:
        return error;
  Error:
+       printk(KERN_ERR "Could not power down device %s: "
+               "error %d\n", kobject_name(&dev->kobj), error);
        dpm_power_up();
        goto Done;
 }
 
-EXPORT_SYMBOL(device_power_down);
+EXPORT_SYMBOL_GPL(device_power_down);
 
+void __suspend_report_result(const char *function, void *fn, int ret)
+{
+       if (ret) {
+               printk(KERN_ERR "%s(): ", function);
+               print_fn_descriptor_symbol("%s() returns ", (unsigned long)fn);
+               printk("%d\n", ret);
+       }
+}
+EXPORT_SYMBOL_GPL(__suspend_report_result);