Commit a392f7d4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / PM: Export rest of the subsys PM callbacks
  ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
  ACPI / PM: Hold ACPI scan lock over the "freeze" sleep state
  ACPI / PM: Export acpi_target_system_state() to modules
parents f58c41cc 4cf563c5
...@@ -900,17 +900,46 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early); ...@@ -900,17 +900,46 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early);
*/ */
int acpi_subsys_prepare(struct device *dev) int acpi_subsys_prepare(struct device *dev)
{ {
/* struct acpi_device *adev = ACPI_COMPANION(dev);
* Devices having power.ignore_children set may still be necessary for u32 sys_target;
* suspending their children in the next phase of device suspend. int ret, state;
*/
if (dev->power.ignore_children) ret = pm_generic_prepare(dev);
pm_runtime_resume(dev); if (ret < 0)
return ret;
if (!adev || !pm_runtime_suspended(dev)
|| device_may_wakeup(dev) != !!adev->wakeup.prepare_count)
return 0;
sys_target = acpi_target_system_state();
if (sys_target == ACPI_STATE_S0)
return 1;
return pm_generic_prepare(dev); if (adev->power.flags.dsw_present)
return 0;
ret = acpi_dev_pm_get_state(dev, adev, sys_target, NULL, &state);
return !ret && state == adev->power.state;
} }
EXPORT_SYMBOL_GPL(acpi_subsys_prepare); EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
/**
* acpi_subsys_complete - Finalize device's resume during system resume.
* @dev: Device to handle.
*/
void acpi_subsys_complete(struct device *dev)
{
/*
* If the device had been runtime-suspended before the system went into
* the sleep state it is going out of and it has never been resumed till
* now, resume it in case the firmware powered it up.
*/
if (dev->power.direct_complete)
pm_request_resume(dev);
}
EXPORT_SYMBOL_GPL(acpi_subsys_complete);
/** /**
* acpi_subsys_suspend - Run the device driver's suspend callback. * acpi_subsys_suspend - Run the device driver's suspend callback.
* @dev: Device to handle. * @dev: Device to handle.
...@@ -923,6 +952,7 @@ int acpi_subsys_suspend(struct device *dev) ...@@ -923,6 +952,7 @@ int acpi_subsys_suspend(struct device *dev)
pm_runtime_resume(dev); pm_runtime_resume(dev);
return pm_generic_suspend(dev); return pm_generic_suspend(dev);
} }
EXPORT_SYMBOL_GPL(acpi_subsys_suspend);
/** /**
* acpi_subsys_suspend_late - Suspend device using ACPI. * acpi_subsys_suspend_late - Suspend device using ACPI.
...@@ -968,6 +998,7 @@ int acpi_subsys_freeze(struct device *dev) ...@@ -968,6 +998,7 @@ int acpi_subsys_freeze(struct device *dev)
pm_runtime_resume(dev); pm_runtime_resume(dev);
return pm_generic_freeze(dev); return pm_generic_freeze(dev);
} }
EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
...@@ -979,6 +1010,7 @@ static struct dev_pm_domain acpi_general_pm_domain = { ...@@ -979,6 +1010,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
#endif #endif
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
.prepare = acpi_subsys_prepare, .prepare = acpi_subsys_prepare,
.complete = acpi_subsys_complete,
.suspend = acpi_subsys_suspend, .suspend = acpi_subsys_suspend,
.suspend_late = acpi_subsys_suspend_late, .suspend_late = acpi_subsys_suspend_late,
.resume_early = acpi_subsys_resume_early, .resume_early = acpi_subsys_resume_early,
......
...@@ -1551,9 +1551,13 @@ static void acpi_bus_get_power_flags(struct acpi_device *device) ...@@ -1551,9 +1551,13 @@ static void acpi_bus_get_power_flags(struct acpi_device *device)
*/ */
if (acpi_has_method(device->handle, "_PSC")) if (acpi_has_method(device->handle, "_PSC"))
device->power.flags.explicit_get = 1; device->power.flags.explicit_get = 1;
if (acpi_has_method(device->handle, "_IRC")) if (acpi_has_method(device->handle, "_IRC"))
device->power.flags.inrush_current = 1; device->power.flags.inrush_current = 1;
if (acpi_has_method(device->handle, "_DSW"))
device->power.flags.dsw_present = 1;
/* /*
* Enumerate supported power management states * Enumerate supported power management states
*/ */
......
...@@ -89,6 +89,7 @@ u32 acpi_target_system_state(void) ...@@ -89,6 +89,7 @@ u32 acpi_target_system_state(void)
{ {
return acpi_target_sleep_state; return acpi_target_sleep_state;
} }
EXPORT_SYMBOL_GPL(acpi_target_system_state);
static bool pwr_btn_event_pending; static bool pwr_btn_event_pending;
...@@ -611,6 +612,22 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = { ...@@ -611,6 +612,22 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = {
.recover = acpi_pm_finish, .recover = acpi_pm_finish,
}; };
static int acpi_freeze_begin(void)
{
acpi_scan_lock_acquire();
return 0;
}
static void acpi_freeze_end(void)
{
acpi_scan_lock_release();
}
static const struct platform_freeze_ops acpi_freeze_ops = {
.begin = acpi_freeze_begin,
.end = acpi_freeze_end,
};
static void acpi_sleep_suspend_setup(void) static void acpi_sleep_suspend_setup(void)
{ {
int i; int i;
...@@ -621,7 +638,9 @@ static void acpi_sleep_suspend_setup(void) ...@@ -621,7 +638,9 @@ static void acpi_sleep_suspend_setup(void)
suspend_set_ops(old_suspend_ordering ? suspend_set_ops(old_suspend_ordering ?
&acpi_suspend_ops_old : &acpi_suspend_ops); &acpi_suspend_ops_old : &acpi_suspend_ops);
freeze_set_ops(&acpi_freeze_ops);
} }
#else /* !CONFIG_SUSPEND */ #else /* !CONFIG_SUSPEND */
static inline void acpi_sleep_suspend_setup(void) {} static inline void acpi_sleep_suspend_setup(void) {}
#endif /* !CONFIG_SUSPEND */ #endif /* !CONFIG_SUSPEND */
......
...@@ -261,7 +261,8 @@ struct acpi_device_power_flags { ...@@ -261,7 +261,8 @@ struct acpi_device_power_flags {
u32 inrush_current:1; /* Serialize Dx->D0 */ u32 inrush_current:1; /* Serialize Dx->D0 */
u32 power_removed:1; /* Optimize Dx->D0 */ u32 power_removed:1; /* Optimize Dx->D0 */
u32 ignore_parent:1; /* Power is independent of parent power state */ u32 ignore_parent:1; /* Power is independent of parent power state */
u32 reserved:27; u32 dsw_present:1; /* _DSW present? */
u32 reserved:26;
}; };
struct acpi_device_power_state { struct acpi_device_power_state {
......
...@@ -555,14 +555,20 @@ static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } ...@@ -555,14 +555,20 @@ static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
int acpi_dev_suspend_late(struct device *dev); int acpi_dev_suspend_late(struct device *dev);
int acpi_dev_resume_early(struct device *dev); int acpi_dev_resume_early(struct device *dev);
int acpi_subsys_prepare(struct device *dev); int acpi_subsys_prepare(struct device *dev);
void acpi_subsys_complete(struct device *dev);
int acpi_subsys_suspend_late(struct device *dev); int acpi_subsys_suspend_late(struct device *dev);
int acpi_subsys_resume_early(struct device *dev); int acpi_subsys_resume_early(struct device *dev);
int acpi_subsys_suspend(struct device *dev);
int acpi_subsys_freeze(struct device *dev);
#else #else
static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } static inline int acpi_dev_suspend_late(struct device *dev) { return 0; }
static inline int acpi_dev_resume_early(struct device *dev) { return 0; } static inline int acpi_dev_resume_early(struct device *dev) { return 0; }
static inline int acpi_subsys_prepare(struct device *dev) { return 0; } static inline int acpi_subsys_prepare(struct device *dev) { return 0; }
static inline void acpi_subsys_complete(struct device *dev) {}
static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; }
static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
static inline int acpi_subsys_suspend(struct device *dev) { return 0; }
static inline int acpi_subsys_freeze(struct device *dev) { return 0; }
#endif #endif
#if defined(CONFIG_ACPI) && defined(CONFIG_PM) #if defined(CONFIG_ACPI) && defined(CONFIG_PM)
......
...@@ -187,6 +187,11 @@ struct platform_suspend_ops { ...@@ -187,6 +187,11 @@ struct platform_suspend_ops {
void (*recover)(void); void (*recover)(void);
}; };
struct platform_freeze_ops {
int (*begin)(void);
void (*end)(void);
};
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
/** /**
* suspend_set_ops - set platform dependent suspend operations * suspend_set_ops - set platform dependent suspend operations
...@@ -194,6 +199,7 @@ struct platform_suspend_ops { ...@@ -194,6 +199,7 @@ struct platform_suspend_ops {
*/ */
extern void suspend_set_ops(const struct platform_suspend_ops *ops); extern void suspend_set_ops(const struct platform_suspend_ops *ops);
extern int suspend_valid_only_mem(suspend_state_t state); extern int suspend_valid_only_mem(suspend_state_t state);
extern void freeze_set_ops(const struct platform_freeze_ops *ops);
extern void freeze_wake(void); extern void freeze_wake(void);
/** /**
...@@ -220,6 +226,7 @@ extern int pm_suspend(suspend_state_t state); ...@@ -220,6 +226,7 @@ extern int pm_suspend(suspend_state_t state);
static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {} static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
static inline void freeze_set_ops(const struct platform_freeze_ops *ops) {}
static inline void freeze_wake(void) {} static inline void freeze_wake(void) {}
#endif /* !CONFIG_SUSPEND */ #endif /* !CONFIG_SUSPEND */
......
...@@ -38,6 +38,7 @@ struct pm_sleep_state pm_states[PM_SUSPEND_MAX] = { ...@@ -38,6 +38,7 @@ struct pm_sleep_state pm_states[PM_SUSPEND_MAX] = {
}; };
static const struct platform_suspend_ops *suspend_ops; static const struct platform_suspend_ops *suspend_ops;
static const struct platform_freeze_ops *freeze_ops;
static bool need_suspend_ops(suspend_state_t state) static bool need_suspend_ops(suspend_state_t state)
{ {
...@@ -47,6 +48,13 @@ static bool need_suspend_ops(suspend_state_t state) ...@@ -47,6 +48,13 @@ static bool need_suspend_ops(suspend_state_t state)
static DECLARE_WAIT_QUEUE_HEAD(suspend_freeze_wait_head); static DECLARE_WAIT_QUEUE_HEAD(suspend_freeze_wait_head);
static bool suspend_freeze_wake; static bool suspend_freeze_wake;
void freeze_set_ops(const struct platform_freeze_ops *ops)
{
lock_system_sleep();
freeze_ops = ops;
unlock_system_sleep();
}
static void freeze_begin(void) static void freeze_begin(void)
{ {
suspend_freeze_wake = false; suspend_freeze_wake = false;
...@@ -291,6 +299,10 @@ int suspend_devices_and_enter(suspend_state_t state) ...@@ -291,6 +299,10 @@ int suspend_devices_and_enter(suspend_state_t state)
error = suspend_ops->begin(state); error = suspend_ops->begin(state);
if (error) if (error)
goto Close; goto Close;
} else if (state == PM_SUSPEND_FREEZE && freeze_ops->begin) {
error = freeze_ops->begin();
if (error)
goto Close;
} }
suspend_console(); suspend_console();
suspend_test_start(); suspend_test_start();
...@@ -316,6 +328,9 @@ int suspend_devices_and_enter(suspend_state_t state) ...@@ -316,6 +328,9 @@ int suspend_devices_and_enter(suspend_state_t state)
Close: Close:
if (need_suspend_ops(state) && suspend_ops->end) if (need_suspend_ops(state) && suspend_ops->end)
suspend_ops->end(); suspend_ops->end();
else if (state == PM_SUSPEND_FREEZE && freeze_ops->end)
freeze_ops->end();
trace_machine_suspend(PWR_EVENT_EXIT); trace_machine_suspend(PWR_EVENT_EXIT);
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment