Commit dad3de7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Add flag for devices capable of generating run-time wake-up events
  PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()
  PM / Runtime: Make documentation of runtime_idle() agree with the code
  PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()
  PM / Runtime: Use deferred_resume flag in pm_request_resume
  PM / Runtime: Export the PM runtime workqueue
  PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
  PM / Hibernate: Swap, use KERN_CONT
  PM / Hibernate: Shift remaining code from swsusp.c to hibernate.c
  PM / Hibernate: Move swap functions to kernel/power/swap.c.
  PM / freezer: Don't get over-anxious while waiting
parents ed9216c1 7a1a8eb5

Documentation/power/runtime_pm.txt

+8 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct dev_pm_ops { 
	...

	int (*runtime_suspend)(struct device *dev);

	int (*runtime_resume)(struct device *dev);

	void (*runtime_idle)(struct device *dev);

	int (*runtime_idle)(struct device *dev);

	...

};
@@ -71,9 +71,9 @@ what to do to handle the device). 
    purpose).



In particular, if the driver requires remote wakeup capability for proper

functioning and device_may_wakeup() returns 'false' for the device, then

functioning and device_run_wake() returns 'false' for the device, then

->runtime_suspend() should return -EBUSY.  On the other hand, if

device_may_wakeup() returns 'true' for the device and the device is put

device_run_wake() returns 'true' for the device and the device is put

into a low power state during the execution of its bus type's

->runtime_suspend(), it is expected that remote wake-up (i.e. hardware mechanism

allowing the device to request a change of its power state, such as PCI PME)
@@ -114,7 +114,8 @@ The action performed by a bus type's ->runtime_idle() callback is totally 
dependent on the bus type in question, but the expected and recommended action

is to check if the device can be suspended (i.e. if all of the conditions

necessary for suspending the device are satisfied) and to queue up a suspend

request for the device in that case.

request for the device in that case.  The value returned by this callback is

ignored by the PM core.



The helper functions provided by the PM core, described in Section 4, guarantee

that the following constraints are met with respect to the bus type's run-time
@@ -214,6 +215,9 @@ defined in include/linux/pm.h: 
      being executed for that device and it is not practical to wait for the

      suspend to complete; means "start a resume as soon as you've suspended"



  unsigned int run_wake;

    - set if the device is capable of generating run-time wake-up events



  enum rpm_status runtime_status;

    - the run-time PM status of the device; this field's initial value is

      RPM_SUSPENDED, which means that each device is initially regarded by the

drivers/base/power/runtime.c

+13 −10
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq) 
	}



	dev->power.runtime_status = RPM_SUSPENDING;

	dev->power.deferred_resume = false;



	if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend) {

		spin_unlock_irq(&dev->power.lock);
@@ -200,7 +201,6 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq) 
	if (retval) {

		dev->power.runtime_status = RPM_ACTIVE;

		pm_runtime_cancel_pending(dev);

		dev->power.deferred_resume = false;



		if (retval == -EAGAIN || retval == -EBUSY) {

			notify = true;
@@ -217,7 +217,6 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq) 
	wake_up_all(&dev->power.wait_queue);



	if (dev->power.deferred_resume) {

		dev->power.deferred_resume = false;

		__pm_runtime_resume(dev, false);

		retval = -EAGAIN;

		goto out;
@@ -626,6 +625,8 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay) 
		goto out;



	dev->power.timer_expires = jiffies + msecs_to_jiffies(delay);

	if (!dev->power.timer_expires)

		dev->power.timer_expires = 1;

	mod_timer(&dev->power.suspend_timer, dev->power.timer_expires);



 out:
@@ -659,13 +660,17 @@ static int __pm_request_resume(struct device *dev) 


	pm_runtime_deactivate_timer(dev);



	if (dev->power.runtime_status == RPM_SUSPENDING) {

		dev->power.deferred_resume = true;

		return retval;

	}

	if (dev->power.request_pending) {

		/* If non-resume request is pending, we can overtake it. */

		dev->power.request = retval ? RPM_REQ_NONE : RPM_REQ_RESUME;

		return retval;

	} else if (retval) {

		return retval;

	}

	if (retval)

		return retval;



	dev->power.request = RPM_REQ_RESUME;

	dev->power.request_pending = true;
@@ -777,7 +782,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) 
	}



	if (parent) {

		spin_lock(&parent->power.lock);

		spin_lock_nested(&parent->power.lock, SINGLE_DEPTH_NESTING);



		/*

		 * It is invalid to put an active child under a parent that is
@@ -786,12 +791,10 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) 
		 */

		if (!parent->power.disable_depth

		    && !parent->power.ignore_children

		    && parent->power.runtime_status != RPM_ACTIVE) {

		    && parent->power.runtime_status != RPM_ACTIVE)

			error = -EBUSY;

		} else {

			if (dev->power.runtime_status == RPM_SUSPENDED)

		else if (dev->power.runtime_status == RPM_SUSPENDED)

			atomic_inc(&parent->power.child_count);

		}



		spin_unlock(&parent->power.lock);

include/linux/pm.h

+5 −3
Original line number Diff line number Diff line
@@ -178,9 +178,10 @@ typedef struct pm_message { 
 *	This need not mean that the device should be put into a low power state.

 *	For example, if the device is behind a link which is about to be turned

 *	off, the device may remain at full power.  If the device does go to low

 *	power and if device_may_wakeup(dev) is true, remote wake-up (i.e., a

 *	hardware mechanism allowing the device to request a change of its power

 *	state, such as PCI PME) should be enabled for it.

 *	power and is capable of generating run-time wake-up events, remote

 *	wake-up (i.e., a hardware mechanism allowing the device to request a

 *	change of its power state via a wake-up event, such as PCI PME) should

 *	be enabled for it.

 *

 * @runtime_resume: Put the device into the fully active state in response to a

 *	wake-up event generated by hardware or at the request of software.  If
@@ -428,6 +429,7 @@ struct dev_pm_info { 
	unsigned int		idle_notification:1;

	unsigned int		request_pending:1;

	unsigned int		deferred_resume:1;

	unsigned int		run_wake:1;

	enum rpm_request	request;

	enum rpm_status		runtime_status;

	int			runtime_error;

include/linux/pm_runtime.h

+12 −0
Original line number Diff line number Diff line
@@ -50,6 +50,16 @@ static inline void pm_runtime_put_noidle(struct device *dev) 
	atomic_add_unless(&dev->power.usage_count, -1, 0);

}



static inline bool device_run_wake(struct device *dev)

{

	return dev->power.run_wake;

}



static inline void device_set_run_wake(struct device *dev, bool enable)

{

	dev->power.run_wake = enable;

}



#else /* !CONFIG_PM_RUNTIME */



static inline int pm_runtime_idle(struct device *dev) { return -ENOSYS; }
@@ -73,6 +83,8 @@ static inline bool pm_children_suspended(struct device *dev) { return false; } 
static inline void pm_suspend_ignore_children(struct device *dev, bool en) {}

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

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

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

static inline void device_set_run_wake(struct device *dev, bool enable) {}



#endif /* !CONFIG_PM_RUNTIME */

kernel/power/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-$(CONFIG_PM_SLEEP) += console.o 
obj-$(CONFIG_FREEZER)		+= process.o

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_PM_TEST_SUSPEND)	+= suspend_test.o

obj-$(CONFIG_HIBERNATION)	+= swsusp.o hibernate.o snapshot.o swap.o user.o

obj-$(CONFIG_HIBERNATION)	+= hibernate.o snapshot.o swap.o user.o

obj-$(CONFIG_HIBERNATION_NVS)	+= hibernate_nvs.o



obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE