Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 019d8817 authored by Alan Stern's avatar Alan Stern Committed by Rafael J. Wysocki
Browse files

PM / sleep: Allow devices without runtime PM to do direct-complete 



Don't unset the direct_complete flag on devices that have runtime PM
disabled, if they are runtime suspended.

This is needed because otherwise ancestor devices wouldn't be able to
do direct_complete without adding runtime PM support to all its
descendants.

Also removes pm_runtime_suspended_if_enabled() because it's now unused.

Signed-off-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6ce12a97

Documentation/power/devices.txt

+7 −0
Original line number Diff line number Diff line
@@ -341,6 +341,13 @@ the phases are: 
	and is entirely responsible for bringing the device back to the

	functional state as appropriate.



	Note that this direct-complete procedure applies even if the device is

	disabled for runtime PM; only the runtime-PM status matters.  It follows

	that if a device has system-sleep callbacks but does not support runtime

	PM, then its prepare callback must never return a positive value.  This

	is because all devices are initially set to runtime-suspended with

	runtime PM disabled.



    2.	The suspend methods should quiesce the device to stop it from performing

	I/O.  They also may save the device registers and put it into the

	appropriate low-power state, depending on the bus type the device is on,

Documentation/power/runtime_pm.txt

+0 −4
Original line number Diff line number Diff line
@@ -445,10 +445,6 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 
  bool pm_runtime_status_suspended(struct device *dev);

    - return true if the device's runtime PM status is 'suspended'



  bool pm_runtime_suspended_if_enabled(struct device *dev);

    - return true if the device's runtime PM status is 'suspended' and its

      'power.disable_depth' field is equal to 1



  void pm_runtime_allow(struct device *dev);

    - set the power.runtime_auto flag for the device and decrease its usage

      counter (used by the /sys/devices/.../power/control interface to

drivers/base/power/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) 
	if (dev->power.direct_complete) {

		if (pm_runtime_status_suspended(dev)) {

			pm_runtime_disable(dev);

			if (pm_runtime_suspended_if_enabled(dev))

			if (pm_runtime_status_suspended(dev))

				goto Complete;



			pm_runtime_enable(dev);

include/linux/pm_runtime.h

+0 −6
Original line number Diff line number Diff line
@@ -98,11 +98,6 @@ static inline bool pm_runtime_status_suspended(struct device *dev) 
	return dev->power.runtime_status == RPM_SUSPENDED;

}



static inline bool pm_runtime_suspended_if_enabled(struct device *dev)

{

	return pm_runtime_status_suspended(dev) && dev->power.disable_depth == 1;

}



static inline bool pm_runtime_enabled(struct device *dev)

{

	return !dev->power.disable_depth;
@@ -164,7 +159,6 @@ static inline void device_set_run_wake(struct device *dev, bool enable) {} 
static inline bool pm_runtime_suspended(struct device *dev) { return false; }

static inline bool pm_runtime_active(struct device *dev) { return true; }

static inline bool pm_runtime_status_suspended(struct device *dev) { return false; }

static inline bool pm_runtime_suspended_if_enabled(struct device *dev) { return false; }

static inline bool pm_runtime_enabled(struct device *dev) { return false; }



static inline void pm_runtime_no_callbacks(struct device *dev) {}