PM: Rework handling of interrupts during suspend-resume

[linux-2.6-omap-h63xx.git] / drivers / base / power / main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index e255341682c88d4a0955f1151595c1334e005dd5..69b4ddb7de3b8c00d59a34fd16af5dc789e7b109 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -23,6 +23,7 @@
 #include <linux/pm.h>
 #include <linux/resume-trace.h>
 #include <linux/rwsem.h>
+#include <linux/interrupt.h>
 
 #include "../base.h"
 #include "power.h"
@@ -349,7 +350,8 @@ static int resume_device_noirq(struct device *dev, pm_message_t state)
  *     Execute the appropriate "noirq resume" callback for all devices marked
  *     as DPM_OFF_IRQ.
  *
- *     Must be called with interrupts disabled and only one CPU running.
+ *     Must be called under dpm_list_mtx.  Device drivers should not receive
+ *     interrupts while it's being executed.
  */
 static void dpm_power_up(pm_message_t state)
 {
@@ -370,14 +372,13 @@ static void dpm_power_up(pm_message_t state)
  *     device_power_up - Turn on all devices that need special attention.
  *     @state: PM transition of the system being carried out.
  *
- *     Power on system devices, then devices that required we shut them down
- *     with interrupts disabled.
- *
- *     Must be called with interrupts disabled.
+ *     Call the "early" resume handlers and enable device drivers to receive
+ *     interrupts.
  */
 void device_power_up(pm_message_t state)
 {
        dpm_power_up(state);
+       resume_device_irqs();
 }
 EXPORT_SYMBOL_GPL(device_power_up);
 
@@ -602,16 +603,17 @@ static int suspend_device_noirq(struct device *dev, pm_message_t state)
  *     device_power_down - Shut down special devices.
  *     @state: PM transition of the system being carried out.
  *
- *     Power down devices that require interrupts to be disabled.
- *     Then power down system devices.
+ *     Prevent device drivers from receiving interrupts and call the "late"
+ *     suspend handlers.
  *
- *     Must be called with interrupts disabled and only one CPU running.
+ *     Must be called under dpm_list_mtx.
  */
 int device_power_down(pm_message_t state)
 {
        struct device *dev;
        int error = 0;
 
+       suspend_device_irqs();
        list_for_each_entry_reverse(dev, &dpm_list, power.entry) {
                error = suspend_device_noirq(dev, state);
                if (error) {
@@ -621,7 +623,7 @@ int device_power_down(pm_message_t state)
                dev->power.status = DPM_OFF_IRQ;
        }
        if (error)
-               dpm_power_up(resume_event(state));
+               device_power_up(resume_event(state));
        return error;
 }
 EXPORT_SYMBOL_GPL(device_power_down);