|
@@ -91,6 +91,8 @@ void device_pm_sleep_init(struct device *dev)
|
|
|
{
|
|
|
dev->power.is_prepared = false;
|
|
|
dev->power.is_suspended = false;
|
|
|
+ dev->power.is_noirq_suspended = false;
|
|
|
+ dev->power.is_late_suspended = false;
|
|
|
init_completion(&dev->power.completion);
|
|
|
complete_all(&dev->power.completion);
|
|
|
dev->power.wakeup = NULL;
|
|
@@ -479,6 +481,9 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
|
|
|
if (dev->power.syscore)
|
|
|
goto Out;
|
|
|
|
|
|
+ if (!dev->power.is_noirq_suspended)
|
|
|
+ goto Out;
|
|
|
+
|
|
|
if (dev->pm_domain) {
|
|
|
info = "noirq power domain ";
|
|
|
callback = pm_noirq_op(&dev->pm_domain->ops, state);
|
|
@@ -499,6 +504,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
|
|
|
}
|
|
|
|
|
|
error = dpm_run_callback(callback, dev, state, info);
|
|
|
+ dev->power.is_noirq_suspended = false;
|
|
|
|
|
|
Out:
|
|
|
TRACE_RESUME(error);
|
|
@@ -561,6 +567,9 @@ static int device_resume_early(struct device *dev, pm_message_t state)
|
|
|
if (dev->power.syscore)
|
|
|
goto Out;
|
|
|
|
|
|
+ if (!dev->power.is_late_suspended)
|
|
|
+ goto Out;
|
|
|
+
|
|
|
if (dev->pm_domain) {
|
|
|
info = "early power domain ";
|
|
|
callback = pm_late_early_op(&dev->pm_domain->ops, state);
|
|
@@ -581,6 +590,7 @@ static int device_resume_early(struct device *dev, pm_message_t state)
|
|
|
}
|
|
|
|
|
|
error = dpm_run_callback(callback, dev, state, info);
|
|
|
+ dev->power.is_late_suspended = false;
|
|
|
|
|
|
Out:
|
|
|
TRACE_RESUME(error);
|
|
@@ -917,6 +927,7 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
|
|
|
{
|
|
|
pm_callback_t callback = NULL;
|
|
|
char *info = NULL;
|
|
|
+ int error;
|
|
|
|
|
|
if (dev->power.syscore)
|
|
|
return 0;
|
|
@@ -940,7 +951,11 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
|
|
|
callback = pm_noirq_op(dev->driver->pm, state);
|
|
|
}
|
|
|
|
|
|
- return dpm_run_callback(callback, dev, state, info);
|
|
|
+ error = dpm_run_callback(callback, dev, state, info);
|
|
|
+ if (!error)
|
|
|
+ dev->power.is_noirq_suspended = true;
|
|
|
+
|
|
|
+ return error;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1003,6 +1018,7 @@ static int device_suspend_late(struct device *dev, pm_message_t state)
|
|
|
{
|
|
|
pm_callback_t callback = NULL;
|
|
|
char *info = NULL;
|
|
|
+ int error;
|
|
|
|
|
|
__pm_runtime_disable(dev, false);
|
|
|
|
|
@@ -1028,7 +1044,11 @@ static int device_suspend_late(struct device *dev, pm_message_t state)
|
|
|
callback = pm_late_early_op(dev->driver->pm, state);
|
|
|
}
|
|
|
|
|
|
- return dpm_run_callback(callback, dev, state, info);
|
|
|
+ error = dpm_run_callback(callback, dev, state, info);
|
|
|
+ if (!error)
|
|
|
+ dev->power.is_late_suspended = true;
|
|
|
+
|
|
|
+ return error;
|
|
|
}
|
|
|
|
|
|
/**
|