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

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

drivers/acpi/device_pm.c

+39 −7
Original line number Diff line number Diff line
@@ -900,17 +900,46 @@ EXPORT_SYMBOL_GPL(acpi_dev_resume_early); 
 */

int acpi_subsys_prepare(struct device *dev)

{

	/*

	 * Devices having power.ignore_children set may still be necessary for

	 * suspending their children in the next phase of device suspend.

	 */

	if (dev->power.ignore_children)

		pm_runtime_resume(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);

	u32 sys_target;

	int ret, state;



	ret = pm_generic_prepare(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);



/**

 * 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.

 * @dev: Device to handle.
@@ -923,6 +952,7 @@ int acpi_subsys_suspend(struct device *dev) 
	pm_runtime_resume(dev);

	return pm_generic_suspend(dev);

}

EXPORT_SYMBOL_GPL(acpi_subsys_suspend);



/**

 * acpi_subsys_suspend_late - Suspend device using ACPI.
@@ -968,6 +998,7 @@ int acpi_subsys_freeze(struct device *dev) 
	pm_runtime_resume(dev);

	return pm_generic_freeze(dev);

}

EXPORT_SYMBOL_GPL(acpi_subsys_freeze);



#endif /* CONFIG_PM_SLEEP */
@@ -979,6 +1010,7 @@ static struct dev_pm_domain acpi_general_pm_domain = { 
#endif

#ifdef CONFIG_PM_SLEEP

		.prepare = acpi_subsys_prepare,

		.complete = acpi_subsys_complete,

		.suspend = acpi_subsys_suspend,

		.suspend_late = acpi_subsys_suspend_late,

		.resume_early = acpi_subsys_resume_early,

drivers/acpi/scan.c

+4 −0
Original line number Diff line number Diff line
@@ -1551,9 +1551,13 @@ static void acpi_bus_get_power_flags(struct acpi_device *device) 
	 */

	if (acpi_has_method(device->handle, "_PSC"))

		device->power.flags.explicit_get = 1;



	if (acpi_has_method(device->handle, "_IRC"))

		device->power.flags.inrush_current = 1;



	if (acpi_has_method(device->handle, "_DSW"))

		device->power.flags.dsw_present = 1;



	/*

	 * Enumerate supported power management states

	 */

drivers/acpi/sleep.c

+19 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ u32 acpi_target_system_state(void) 
{

	return acpi_target_sleep_state;

}

EXPORT_SYMBOL_GPL(acpi_target_system_state);



static bool pwr_btn_event_pending;
@@ -611,6 +612,22 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = { 
	.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)

{

	int i;
@@ -621,7 +638,9 @@ static void acpi_sleep_suspend_setup(void) 


	suspend_set_ops(old_suspend_ordering ?

		&acpi_suspend_ops_old : &acpi_suspend_ops);

	freeze_set_ops(&acpi_freeze_ops);

}



#else /* !CONFIG_SUSPEND */

static inline void acpi_sleep_suspend_setup(void) {}

#endif /* !CONFIG_SUSPEND */

include/acpi/acpi_bus.h

+2 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ struct acpi_device_power_flags { 
	u32 inrush_current:1;	/* Serialize Dx->D0 */

	u32 power_removed:1;	/* Optimize Dx->D0 */

	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 {

include/linux/acpi.h

+6 −0
Original line number Diff line number Diff line
@@ -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_resume_early(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_resume_early(struct device *dev);

int acpi_subsys_suspend(struct device *dev);

int acpi_subsys_freeze(struct device *dev);

#else

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_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_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



#if defined(CONFIG_ACPI) && defined(CONFIG_PM)