===================================================================
@@ -912,12 +912,28 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early)
*/
int acpi_subsys_prepare(struct device *dev)
{
+ struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+ u32 target_state;
+ int error, state;
+
+ if (!adev || !pm_runtime_enabled_and_suspended(dev))
+ return pm_generic_prepare(dev);
+
+ target_state = acpi_target_system_state();
+ error = acpi_dev_pm_get_state(dev, adev, target_state, NULL, &state);
+ if (error || state != adev->power.state
+ || device_may_wakeup(dev) != !!adev->wakeup.prepare_count) {
+ pm_runtime_resume(dev);
+ return pm_generic_prepare(dev);
+ }
/*
- * Follow PCI and resume devices suspended at run time before running
- * their system suspend callbacks.
+ * If this is a wakeup device, wakeup power has been enabled already for
+ * it during the preceding runtime suspend. Caveat: "sleep state" is
+ * one of the _DSW arguments, but that shouldn't matter for the devices
+ * using acpi_general_pm_domain.
*/
- pm_runtime_resume(dev);
- return pm_generic_prepare(dev);
+ error = pm_generic_prepare(dev);
+ return error ? error : 1;
}
EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
@@ -945,10 +961,27 @@ EXPORT_SYMBOL_GPL(acpi_subsys_suspend_la
*/
int acpi_subsys_resume_early(struct device *dev)
{
- int ret = acpi_dev_resume_early(dev);
+ int ret;
+
+ if (dev->power.no_suspend)
+ return 0;
+
+ ret = acpi_dev_resume_early(dev);
return ret ? ret : pm_generic_resume_early(dev);
}
EXPORT_SYMBOL_GPL(acpi_subsys_resume_early);
+
+/**
+ * acpi_subsys_resume - Resume device using ACPI (if not resumed before).
+ * @dev: Device to resume.
+ *
+ * If power.no_suspend is set for @dev, run pm_runtime_resume() for it.
+ */
+int acpi_subsys_resume(struct device *dev)
+{
+ return dev->power.no_suspend ? pm_runtime_resume(dev) : 0;
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_resume);
#endif /* CONFIG_PM_SLEEP */
static struct dev_pm_domain acpi_general_pm_domain = {
@@ -961,8 +994,10 @@ static struct dev_pm_domain acpi_general
.prepare = acpi_subsys_prepare,
.suspend_late = acpi_subsys_suspend_late,
.resume_early = acpi_subsys_resume_early,
+ .resume = acpi_subsys_resume,
.poweroff_late = acpi_subsys_suspend_late,
.restore_early = acpi_subsys_resume_early,
+ .restore = acpi_subsys_resume,
#endif
},
};