]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/base/power/suspend.c
mlx4_core: Support ICM tables in coherent memory
[linux-2.6-omap-h63xx.git] / drivers / base / power / suspend.c
index 69509e02f703c6a32a9c158f70cf558bf70d77cb..26df9b231737de51c0541567553704cac4381d70 100644 (file)
@@ -34,11 +34,20 @@ static inline char *suspend_verb(u32 event)
        switch (event) {
        case PM_EVENT_SUSPEND:  return "suspend";
        case PM_EVENT_FREEZE:   return "freeze";
+       case PM_EVENT_PRETHAW:  return "prethaw";
        default:                return "(unknown suspend event)";
        }
 }
 
 
+static void
+suspend_device_dbg(struct device *dev, pm_message_t state, char *info)
+{
+       dev_dbg(dev, "%s%s%s\n", info, suspend_verb(state.event),
+               ((state.event == PM_EVENT_SUSPEND) && device_may_wakeup(dev)) ?
+               ", may wakeup" : "");
+}
+
 /**
  *     suspend_device - Save state of one device.
  *     @dev:   Device.
@@ -54,25 +63,21 @@ int suspend_device(struct device * dev, pm_message_t state)
                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 (dev->class && dev->class->suspend) {
+               suspend_device_dbg(dev, state, "class ");
+               error = dev->class->suspend(dev, state);
+               suspend_report_result(dev->class->suspend, error);
        }
 
-       dev->power.prev_state = dev->power.power_state;
+       if (!error && dev->type && dev->type->suspend) {
+               suspend_device_dbg(dev, state, "type ");
+               error = dev->type->suspend(dev, state);
+               suspend_report_result(dev->type->suspend, error);
+       }
 
-       if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
-               dev_dbg(dev, "%s%s\n",
-                       suspend_verb(state.event),
-                       ((state.event == PM_EVENT_SUSPEND)
-                                       && device_may_wakeup(dev))
-                               ? ", may wakeup"
-                               : ""
-                       );
+       if (!error && dev->bus && dev->bus->suspend) {
+               suspend_device_dbg(dev, state, "");
                error = dev->bus->suspend(dev, state);
                suspend_report_result(dev->bus->suspend, error);
        }
@@ -81,15 +86,36 @@ int suspend_device(struct device * dev, pm_message_t state)
 }
 
 
+/*
+ * This is called with interrupts off, only a single CPU
+ * running. We can't acquire a mutex or semaphore (and we don't
+ * need the protection)
+ */
+static int suspend_device_late(struct device *dev, pm_message_t state)
+{
+       int error = 0;
+
+       if (dev->bus && dev->bus->suspend_late) {
+               suspend_device_dbg(dev, state, "LATE ");
+               error = dev->bus->suspend_late(dev, state);
+               suspend_report_result(dev->bus->suspend_late, error);
+       }
+       return error;
+}
+
 /**
  *     device_suspend - Save state and stop all devices in system.
  *     @state:         Power state to put each device in.
  *
  *     Walk the dpm_active list, call ->suspend() for each device, and move
- *     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.
+ *     it to the dpm_off list.
+ *
+ *     (For historical reasons, if it returns -EAGAIN, that used to mean
+ *     that the device would be called again with interrupts disabled.
+ *     These days, we use the "suspend_late()" callback for that, so we
+ *     print a warning and consider it an error).
+ *
+ *     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.
@@ -100,54 +126,43 @@ int device_suspend(pm_message_t state)
 {
        int error = 0;
 
-       down(&dpm_sem);
-       down(&dpm_list_sem);
+       might_sleep();
+       mutex_lock(&dpm_mtx);
+       mutex_lock(&dpm_list_mtx);
        while (!list_empty(&dpm_active) && error == 0) {
                struct list_head * entry = dpm_active.prev;
                struct device * dev = to_device(entry);
 
                get_device(dev);
-               up(&dpm_list_sem);
+               mutex_unlock(&dpm_list_mtx);
 
                error = suspend_device(dev, state);
 
-               down(&dpm_list_sem);
+               mutex_lock(&dpm_list_mtx);
 
                /* Check if the device got removed */
                if (!list_empty(&dev->power.entry)) {
-                       /* Move it to the dpm_off or dpm_off_irq list */
+                       /* Move it to the dpm_off list */
                        if (!error)
                                list_move(&dev->power.entry, &dpm_off);
-                       else if (error == -EAGAIN) {
-                               list_move(&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);
+                               "error %d%s\n",
+                               kobject_name(&dev->kobj), error,
+                               error == -EAGAIN ? " (please convert to suspend_late)" : "");
                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_move(entry, &dpm_off);
-               }
+       mutex_unlock(&dpm_list_mtx);
+       if (error)
                dpm_resume();
-       }
-       up(&dpm_sem);
+
+       mutex_unlock(&dpm_mtx);
        return error;
 }
 
 EXPORT_SYMBOL_GPL(device_suspend);
 
-
 /**
  *     device_power_down - Shut down special devices.
  *     @state:         Power state to enter.
@@ -162,14 +177,17 @@ 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)))
-                       break;
+       while (!list_empty(&dpm_off)) {
+               struct list_head * entry = dpm_off.prev;
+
+               dev = to_device(entry);
+               error = suspend_device_late(dev, state);
+               if (error)
+                       goto Error;
+               list_move(&dev->power.entry, &dpm_off_irq);
        }
-       if (error)
-               goto Error;
-       if ((error = sysdev_suspend(state)))
-               goto Error;
+
+       error = sysdev_suspend(state);
  Done:
        return error;
  Error: