PM / Sleep: Introduce "late suspend" and "early resume" of devices (cf579dfb) · Commits · 戴 / test

Documentation/power/devices.txt

+61 −32

Original line number	Diff line number	Diff line
		@@ -96,6 +96,12 @@ struct dev_pm_ops {
		int (thaw)(struct device dev);
		int (poweroff)(struct device dev);
		int (restore)(struct device dev);
		int (suspend_late)(struct device dev);
		int (resume_early)(struct device dev);
		int (freeze_late)(struct device dev);
		int (thaw_early)(struct device dev);
		int (poweroff_late)(struct device dev);
		int (restore_early)(struct device dev);
		int (suspend_noirq)(struct device dev);
		int (resume_noirq)(struct device dev);
		int (freeze_noirq)(struct device dev);
		@@ -305,7 +311,7 @@ Entering System Suspend
		-----------------------
		When the system goes into the standby or memory sleep state, the phases are:

		prepare, suspend, suspend_noirq.
		prepare, suspend, suspend_late, suspend_noirq.

		1. The prepare phase is meant to prevent races by preventing new devices
		from being registered; the PM core would never know that all the
		@@ -324,7 +330,12 @@ When the system goes into the standby or memory sleep state, the phases are:
		appropriate low-power state, depending on the bus type the device is on,
		and they may enable wakeup events.

		3. The suspend_noirq phase occurs after IRQ handlers have been disabled,
		3 For a number of devices it is convenient to split suspend into the
		"quiesce device" and "save device state" phases, in which cases
		suspend_late is meant to do the latter. It is always executed after
		runtime power management has been disabled for all devices.

		4. The suspend_noirq phase occurs after IRQ handlers have been disabled,
		which means that the driver's interrupt handler will not be called while
		the callback method is running. The methods should save the values of
		the device's registers that weren't saved previously and finally put the
		@@ -359,7 +370,7 @@ Leaving System Suspend
		----------------------
		When resuming from standby or memory sleep, the phases are:

		resume_noirq, resume, complete.
		resume_noirq, resume_early, resume, complete.

		1. The resume_noirq callback methods should perform any actions needed
		before the driver's interrupt handlers are invoked. This generally
		@@ -375,14 +386,18 @@ When resuming from standby or memory sleep, the phases are:
		device driver's ->pm.resume_noirq() method to perform device-specific
		actions.

		2. The resume methods should bring the the device back to its operating
		2. The resume_early methods should prepare devices for the execution of
		the resume methods. This generally involves undoing the actions of the
		preceding suspend_late phase.

		3 The resume methods should bring the the device back to its operating
		state, so that it can perform normal I/O. This generally involves
		undoing the actions of the suspend phase.

		3. The complete phase uses only a bus callback. The method should undo the
		actions of the prepare phase. Note, however, that new children may be
		registered below the device as soon as the resume callbacks occur; it's
		not necessary to wait until the complete phase.
		4. The complete phase should undo the actions of the prepare phase. Note,
		however, that new children may be registered below the device as soon as
		the resume callbacks occur; it's not necessary to wait until the
		complete phase.

		At the end of these phases, drivers should be as functional as they were before
		suspending: I/O can be performed using DMA and IRQs, and the relevant clocks are
		@@ -429,8 +444,8 @@ an image of the system memory while everything is stable, reactivate all
		devices (thaw), write the image to permanent storage, and finally shut down the
		system (poweroff). The phases used to accomplish this are:

		prepare, freeze, freeze_noirq, thaw_noirq, thaw, complete,
		prepare, poweroff, poweroff_noirq
		prepare, freeze, freeze_late, freeze_noirq, thaw_noirq, thaw_early,
		thaw, complete, prepare, poweroff, poweroff_late, poweroff_noirq

		1. The prepare phase is discussed in the "Entering System Suspend" section
		above.
		@@ -441,7 +456,11 @@ system (poweroff). The phases used to accomplish this are:
		save time it's best not to do so. Also, the device should not be
		prepared to generate wakeup events.

		3. The freeze_noirq phase is analogous to the suspend_noirq phase discussed
		3. The freeze_late phase is analogous to the suspend_late phase described
		above, except that the device should not be put in a low-power state and
		should not be allowed to generate wakeup events by it.

		4. The freeze_noirq phase is analogous to the suspend_noirq phase discussed
		above, except again that the device should not be put in a low-power
		state and should not be allowed to generate wakeup events.

		@@ -449,15 +468,19 @@ At this point the system image is created. All devices should be inactive and
		the contents of memory should remain undisturbed while this happens, so that the
		image forms an atomic snapshot of the system state.

		4. The thaw_noirq phase is analogous to the resume_noirq phase discussed
		5. The thaw_noirq phase is analogous to the resume_noirq phase discussed
		above. The main difference is that its methods can assume the device is
		in the same state as at the end of the freeze_noirq phase.

		5. The thaw phase is analogous to the resume phase discussed above. Its
		6. The thaw_early phase is analogous to the resume_early phase described
		above. Its methods should undo the actions of the preceding
		freeze_late, if necessary.

		7. The thaw phase is analogous to the resume phase discussed above. Its
		methods should bring the device back to an operating state, so that it
		can be used for saving the image if necessary.

		6. The complete phase is discussed in the "Leaving System Suspend" section
		8. The complete phase is discussed in the "Leaving System Suspend" section
		above.

		At this point the system image is saved, and the devices then need to be
		@@ -465,16 +488,19 @@ prepared for the upcoming system shutdown. This is much like suspending them
		before putting the system into the standby or memory sleep state, and the phases
		are similar.

		7. The prepare phase is discussed above.
		9. The prepare phase is discussed above.

		10. The poweroff phase is analogous to the suspend phase.

		8. The poweroff phase is analogous to the suspend phase.
		11. The poweroff_late phase is analogous to the suspend_late phase.

		9. The poweroff_noirq phase is analogous to the suspend_noirq phase.
		12. The poweroff_noirq phase is analogous to the suspend_noirq phase.

		The poweroff and poweroff_noirq callbacks should do essentially the same things
		as the suspend and suspend_noirq callbacks. The only notable difference is that
		they need not store the device register values, because the registers should
		already have been stored during the freeze or freeze_noirq phases.
		The poweroff, poweroff_late and poweroff_noirq callbacks should do essentially
		the same things as the suspend, suspend_late and suspend_noirq callbacks,
		respectively. The only notable difference is that they need not store the
		device register values, because the registers should already have been stored
		during the freeze, freeze_late or freeze_noirq phases.


		Leaving Hibernation
		@@ -518,22 +544,25 @@ To achieve this, the image kernel must restore the devices' pre-hibernation
		functionality. The operation is much like waking up from the memory sleep
		state, although it involves different phases:

		restore_noirq, restore, complete
		restore_noirq, restore_early, restore, complete

		1. The restore_noirq phase is analogous to the resume_noirq phase.

		2. The restore phase is analogous to the resume phase.
		2. The restore_early phase is analogous to the resume_early phase.

		3. The restore phase is analogous to the resume phase.

		3. The complete phase is discussed above.
		4. The complete phase is discussed above.

		The main difference from resume[_noirq] is that restore[_noirq] must assume the
		device has been accessed and reconfigured by the boot loader or the boot kernel.
		Consequently the state of the device may be different from the state remembered
		from the freeze and freeze_noirq phases. The device may even need to be reset
		and completely re-initialized. In many cases this difference doesn't matter, so
		the resume[_noirq] and restore[_norq] method pointers can be set to the same
		routines. Nevertheless, different callback pointers are used in case there is a
		situation where it actually matters.
		The main difference from resume[_early\|_noirq] is that restore[_early\|_noirq]
		must assume the device has been accessed and reconfigured by the boot loader or
		the boot kernel. Consequently the state of the device may be different from the
		state remembered from the freeze, freeze_late and freeze_noirq phases. The
		device may even need to be reset and completely re-initialized. In many cases
		this difference doesn't matter, so the resume[_early\|_noirq] and
		restore[_early\|_norq] method pointers can be set to the same routines.
		Nevertheless, different callback pointers are used in case there is a situation
		where it actually does matter.


		Device Power Management Domains

arch/x86/kernel/apm_32.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -1234,8 +1234,7 @@ static int suspend(int vetoable)
		struct apm_user *as;

		dpm_suspend_start(PMSG_SUSPEND);

		dpm_suspend_noirq(PMSG_SUSPEND);
		dpm_suspend_end(PMSG_SUSPEND);

		local_irq_disable();
		syscore_suspend();
		@@ -1259,9 +1258,9 @@ static int suspend(int vetoable)
		syscore_resume();
		local_irq_enable();

		dpm_resume_noirq(PMSG_RESUME);

		dpm_resume_start(PMSG_RESUME);
		dpm_resume_end(PMSG_RESUME);

		queue_event(APM_NORMAL_RESUME, NULL);
		spin_lock(&user_list_lock);
		for (as = user_list; as != NULL; as = as->next) {
		@@ -1277,7 +1276,7 @@ static void standby(void)
		{
		int err;

		dpm_suspend_noirq(PMSG_SUSPEND);
		dpm_suspend_end(PMSG_SUSPEND);

		local_irq_disable();
		syscore_suspend();
		@@ -1291,7 +1290,7 @@ static void standby(void)
		syscore_resume();
		local_irq_enable();

		dpm_resume_noirq(PMSG_RESUME);
		dpm_resume_start(PMSG_RESUME);
		}

		static apm_event_t get_event(void)

drivers/base/power/main.c

+225 −22

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ typedef int (pm_callback_t)(struct device );
		LIST_HEAD(dpm_list);
		LIST_HEAD(dpm_prepared_list);
		LIST_HEAD(dpm_suspended_list);
		LIST_HEAD(dpm_late_early_list);
		LIST_HEAD(dpm_noirq_list);

		struct suspend_stats suspend_stats;
		@@ -245,6 +246,40 @@ static pm_callback_t pm_op(const struct dev_pm_ops *ops, pm_message_t state)
		return NULL;
		}

		/**
		* pm_late_early_op - Return the PM operation appropriate for given PM event.
		* @ops: PM operations to choose from.
		* @state: PM transition of the system being carried out.
		*
		* Runtime PM is disabled for @dev while this function is being executed.
		*/
		static pm_callback_t pm_late_early_op(const struct dev_pm_ops *ops,
		pm_message_t state)
		{
		switch (state.event) {
		#ifdef CONFIG_SUSPEND
		case PM_EVENT_SUSPEND:
		return ops->suspend_late;
		case PM_EVENT_RESUME:
		return ops->resume_early;
		#endif /* CONFIG_SUSPEND */
		#ifdef CONFIG_HIBERNATE_CALLBACKS
		case PM_EVENT_FREEZE:
		case PM_EVENT_QUIESCE:
		return ops->freeze_late;
		case PM_EVENT_HIBERNATE:
		return ops->poweroff_late;
		case PM_EVENT_THAW:
		case PM_EVENT_RECOVER:
		return ops->thaw_early;
		case PM_EVENT_RESTORE:
		return ops->restore_early;
		#endif /* CONFIG_HIBERNATE_CALLBACKS */
		}

		return NULL;
		}

		/**
		* pm_noirq_op - Return the PM operation appropriate for given PM event.
		* @ops: PM operations to choose from.
		@@ -374,21 +409,21 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
		TRACE_RESUME(0);

		if (dev->pm_domain) {
		info = "EARLY power domain ";
		info = "noirq power domain ";
		callback = pm_noirq_op(&dev->pm_domain->ops, state);
		} else if (dev->type && dev->type->pm) {
		info = "EARLY type ";
		info = "noirq type ";
		callback = pm_noirq_op(dev->type->pm, state);
		} else if (dev->class && dev->class->pm) {
		info = "EARLY class ";
		info = "noirq class ";
		callback = pm_noirq_op(dev->class->pm, state);
		} else if (dev->bus && dev->bus->pm) {
		info = "EARLY bus ";
		info = "noirq bus ";
		callback = pm_noirq_op(dev->bus->pm, state);
		}

		if (!callback && dev->driver && dev->driver->pm) {
		info = "EARLY driver ";
		info = "noirq driver ";
		callback = pm_noirq_op(dev->driver->pm, state);
		}

		@@ -399,13 +434,13 @@ static int device_resume_noirq(struct device *dev, pm_message_t state)
		}

		/**
		* dpm_resume_noirq - Execute "early resume" callbacks for non-sysdev devices.
		* dpm_resume_noirq - Execute "noirq resume" callbacks for all devices.
		* @state: PM transition of the system being carried out.
		*
		* Call the "noirq" resume handlers for all devices marked as DPM_OFF_IRQ and
		* Call the "noirq" resume handlers for all devices in dpm_noirq_list and
		* enable device drivers to receive interrupts.
		*/
		void dpm_resume_noirq(pm_message_t state)
		static void dpm_resume_noirq(pm_message_t state)
		{
		ktime_t starttime = ktime_get();

		@@ -415,7 +450,7 @@ void dpm_resume_noirq(pm_message_t state)
		int error;

		get_device(dev);
		list_move_tail(&dev->power.entry, &dpm_suspended_list);
		list_move_tail(&dev->power.entry, &dpm_late_early_list);
		mutex_unlock(&dpm_list_mtx);

		error = device_resume_noirq(dev, state);
		@@ -423,6 +458,80 @@ void dpm_resume_noirq(pm_message_t state)
		suspend_stats.failed_resume_noirq++;
		dpm_save_failed_step(SUSPEND_RESUME_NOIRQ);
		dpm_save_failed_dev(dev_name(dev));
		pm_dev_err(dev, state, " noirq", error);
		}

		mutex_lock(&dpm_list_mtx);
		put_device(dev);
		}
		mutex_unlock(&dpm_list_mtx);
		dpm_show_time(starttime, state, "noirq");
		resume_device_irqs();
		}

		/**
		* device_resume_early - Execute an "early resume" callback for given device.
		* @dev: Device to handle.
		* @state: PM transition of the system being carried out.
		*
		* Runtime PM is disabled for @dev while this function is being executed.
		*/
		static int device_resume_early(struct device *dev, pm_message_t state)
		{
		pm_callback_t callback = NULL;
		char *info = NULL;
		int error = 0;

		TRACE_DEVICE(dev);
		TRACE_RESUME(0);

		if (dev->pm_domain) {
		info = "early power domain ";
		callback = pm_late_early_op(&dev->pm_domain->ops, state);
		} else if (dev->type && dev->type->pm) {
		info = "early type ";
		callback = pm_late_early_op(dev->type->pm, state);
		} else if (dev->class && dev->class->pm) {
		info = "early class ";
		callback = pm_late_early_op(dev->class->pm, state);
		} else if (dev->bus && dev->bus->pm) {
		info = "early bus ";
		callback = pm_late_early_op(dev->bus->pm, state);
		}

		if (!callback && dev->driver && dev->driver->pm) {
		info = "early driver ";
		callback = pm_late_early_op(dev->driver->pm, state);
		}

		error = dpm_run_callback(callback, dev, state, info);

		TRACE_RESUME(error);
		return error;
		}

		/**
		* dpm_resume_early - Execute "early resume" callbacks for all devices.
		* @state: PM transition of the system being carried out.
		*/
		static void dpm_resume_early(pm_message_t state)
		{
		ktime_t starttime = ktime_get();

		mutex_lock(&dpm_list_mtx);
		while (!list_empty(&dpm_late_early_list)) {
		struct device *dev = to_device(dpm_late_early_list.next);
		int error;

		get_device(dev);
		list_move_tail(&dev->power.entry, &dpm_suspended_list);
		mutex_unlock(&dpm_list_mtx);

		error = device_resume_early(dev, state);
		if (error) {
		suspend_stats.failed_resume_early++;
		dpm_save_failed_step(SUSPEND_RESUME_EARLY);
		dpm_save_failed_dev(dev_name(dev));
		pm_dev_err(dev, state, " early", error);
		}

		@@ -431,9 +540,18 @@ void dpm_resume_noirq(pm_message_t state)
		}
		mutex_unlock(&dpm_list_mtx);
		dpm_show_time(starttime, state, "early");
		resume_device_irqs();
		}
		EXPORT_SYMBOL_GPL(dpm_resume_noirq);

		/**
		* dpm_resume_start - Execute "noirq" and "early" device callbacks.
		* @state: PM transition of the system being carried out.
		*/
		void dpm_resume_start(pm_message_t state)
		{
		dpm_resume_noirq(state);
		dpm_resume_early(state);
		}
		EXPORT_SYMBOL_GPL(dpm_resume_start);

		/**
		* device_resume - Execute "resume" callbacks for given device.
		@@ -716,21 +834,21 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
		char *info = NULL;

		if (dev->pm_domain) {
		info = "LATE power domain ";
		info = "noirq power domain ";
		callback = pm_noirq_op(&dev->pm_domain->ops, state);
		} else if (dev->type && dev->type->pm) {
		info = "LATE type ";
		info = "noirq type ";
		callback = pm_noirq_op(dev->type->pm, state);
		} else if (dev->class && dev->class->pm) {
		info = "LATE class ";
		info = "noirq class ";
		callback = pm_noirq_op(dev->class->pm, state);
		} else if (dev->bus && dev->bus->pm) {
		info = "LATE bus ";
		info = "noirq bus ";
		callback = pm_noirq_op(dev->bus->pm, state);
		}

		if (!callback && dev->driver && dev->driver->pm) {
		info = "LATE driver ";
		info = "noirq driver ";
		callback = pm_noirq_op(dev->driver->pm, state);
		}

		@@ -738,21 +856,21 @@ static int device_suspend_noirq(struct device *dev, pm_message_t state)
		}

		/**
		* dpm_suspend_noirq - Execute "late suspend" callbacks for non-sysdev devices.
		* dpm_suspend_noirq - Execute "noirq suspend" callbacks for all devices.
		* @state: PM transition of the system being carried out.
		*
		* Prevent device drivers from receiving interrupts and call the "noirq" suspend
		* handlers for all non-sysdev devices.
		*/
		int dpm_suspend_noirq(pm_message_t state)
		static int dpm_suspend_noirq(pm_message_t state)
		{
		ktime_t starttime = ktime_get();
		int error = 0;

		suspend_device_irqs();
		mutex_lock(&dpm_list_mtx);
		while (!list_empty(&dpm_suspended_list)) {
		struct device *dev = to_device(dpm_suspended_list.prev);
		while (!list_empty(&dpm_late_early_list)) {
		struct device *dev = to_device(dpm_late_early_list.prev);

		get_device(dev);
		mutex_unlock(&dpm_list_mtx);
		@@ -761,7 +879,7 @@ int dpm_suspend_noirq(pm_message_t state)

		mutex_lock(&dpm_list_mtx);
		if (error) {
		pm_dev_err(dev, state, " late", error);
		pm_dev_err(dev, state, " noirq", error);
		suspend_stats.failed_suspend_noirq++;
		dpm_save_failed_step(SUSPEND_SUSPEND_NOIRQ);
		dpm_save_failed_dev(dev_name(dev));
		@@ -775,11 +893,96 @@ int dpm_suspend_noirq(pm_message_t state)
		mutex_unlock(&dpm_list_mtx);
		if (error)
		dpm_resume_noirq(resume_event(state));
		else
		dpm_show_time(starttime, state, "noirq");
		return error;
		}

		/**
		* device_suspend_late - Execute a "late suspend" callback for given device.
		* @dev: Device to handle.
		* @state: PM transition of the system being carried out.
		*
		* Runtime PM is disabled for @dev while this function is being executed.
		*/
		static int device_suspend_late(struct device *dev, pm_message_t state)
		{
		pm_callback_t callback = NULL;
		char *info = NULL;

		if (dev->pm_domain) {
		info = "late power domain ";
		callback = pm_late_early_op(&dev->pm_domain->ops, state);
		} else if (dev->type && dev->type->pm) {
		info = "late type ";
		callback = pm_late_early_op(dev->type->pm, state);
		} else if (dev->class && dev->class->pm) {
		info = "late class ";
		callback = pm_late_early_op(dev->class->pm, state);
		} else if (dev->bus && dev->bus->pm) {
		info = "late bus ";
		callback = pm_late_early_op(dev->bus->pm, state);
		}

		if (!callback && dev->driver && dev->driver->pm) {
		info = "late driver ";
		callback = pm_late_early_op(dev->driver->pm, state);
		}

		return dpm_run_callback(callback, dev, state, info);
		}

		/**
		* dpm_suspend_late - Execute "late suspend" callbacks for all devices.
		* @state: PM transition of the system being carried out.
		*/
		static int dpm_suspend_late(pm_message_t state)
		{
		ktime_t starttime = ktime_get();
		int error = 0;

		mutex_lock(&dpm_list_mtx);
		while (!list_empty(&dpm_suspended_list)) {
		struct device *dev = to_device(dpm_suspended_list.prev);

		get_device(dev);
		mutex_unlock(&dpm_list_mtx);

		error = device_suspend_late(dev, state);

		mutex_lock(&dpm_list_mtx);
		if (error) {
		pm_dev_err(dev, state, " late", error);
		suspend_stats.failed_suspend_late++;
		dpm_save_failed_step(SUSPEND_SUSPEND_LATE);
		dpm_save_failed_dev(dev_name(dev));
		put_device(dev);
		break;
		}
		if (!list_empty(&dev->power.entry))
		list_move(&dev->power.entry, &dpm_late_early_list);
		put_device(dev);
		}
		mutex_unlock(&dpm_list_mtx);
		if (error)
		dpm_resume_early(resume_event(state));
		else
		dpm_show_time(starttime, state, "late");

		return error;
		}
		EXPORT_SYMBOL_GPL(dpm_suspend_noirq);

		/**
		* dpm_suspend_end - Execute "late" and "noirq" device suspend callbacks.
		* @state: PM transition of the system being carried out.
		*/
		int dpm_suspend_end(pm_message_t state)
		{
		int error = dpm_suspend_late(state);

		return error ? : dpm_suspend_noirq(state);
		}
		EXPORT_SYMBOL_GPL(dpm_suspend_end);

		/**
		* legacy_suspend - Execute a legacy (bus or class) suspend callback for device.

drivers/xen/manage.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -129,9 +129,9 @@ static void do_suspend(void)
		printk(KERN_DEBUG "suspending xenstore...\n");
		xs_suspend();

		err = dpm_suspend_noirq(PMSG_FREEZE);
		err = dpm_suspend_end(PMSG_FREEZE);
		if (err) {
		printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
		printk(KERN_ERR "dpm_suspend_end failed: %d\n", err);
		goto out_resume;
		}

		@@ -149,7 +149,7 @@ static void do_suspend(void)

		err = stop_machine(xen_suspend, &si, cpumask_of(0));

		dpm_resume_noirq(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
		dpm_resume_start(si.cancelled ? PMSG_THAW : PMSG_RESTORE);

		if (err) {
		printk(KERN_ERR "failed to start xen_suspend: %d\n", err);

include/linux/pm.h

+35 −8

Original line number	Diff line number	Diff line
		@@ -110,6 +110,10 @@ typedef struct pm_message {
		* Subsystem-level @suspend() is executed for all devices after invoking
		* subsystem-level @prepare() for all of them.
		*
		* @suspend_late: Continue operations started by @suspend(). For a number of
		* devices @suspend_late() may point to the same callback routine as the
		* runtime suspend callback.
		*
		* @resume: Executed after waking the system up from a sleep state in which the
		* contents of main memory were preserved. The exact action to perform
		* depends on the device's subsystem, but generally the driver is expected
		@@ -122,6 +126,10 @@ typedef struct pm_message {
		* Subsystem-level @resume() is executed for all devices after invoking
		* subsystem-level @resume_noirq() for all of them.
		*
		* @resume_early: Prepare to execute @resume(). For a number of devices
		* @resume_early() may point to the same callback routine as the runtime
		* resume callback.
		*
		* @freeze: Hibernation-specific, executed before creating a hibernation image.
		* Analogous to @suspend(), but it should not enable the device to signal
		* wakeup events or change its power state. The majority of subsystems
		@@ -131,6 +139,10 @@ typedef struct pm_message {
		* Subsystem-level @freeze() is executed for all devices after invoking
		* subsystem-level @prepare() for all of them.
		*
		* @freeze_late: Continue operations started by @freeze(). Analogous to
		* @suspend_late(), but it should not enable the device to signal wakeup
		* events or change its power state.
		*
		* @thaw: Hibernation-specific, executed after creating a hibernation image OR
		* if the creation of an image has failed. Also executed after a failing
		* attempt to restore the contents of main memory from such an image.
		@@ -140,15 +152,23 @@ typedef struct pm_message {
		* subsystem-level @thaw_noirq() for all of them. It also may be executed
		* directly after @freeze() in case of a transition error.
		*
		* @thaw_early: Prepare to execute @thaw(). Undo the changes made by the
		* preceding @freeze_late().
		*
		* @poweroff: Hibernation-specific, executed after saving a hibernation image.
		* Analogous to @suspend(), but it need not save the device's settings in
		* memory.
		* Subsystem-level @poweroff() is executed for all devices after invoking
		* subsystem-level @prepare() for all of them.
		*
		* @poweroff_late: Continue operations started by @poweroff(). Analogous to
		* @suspend_late(), but it need not save the device's settings in memory.
		*
		* @restore: Hibernation-specific, executed after restoring the contents of main
		* memory from a hibernation image, analogous to @resume().
		*
		* @restore_early: Prepare to execute @restore(), analogous to @resume_early().
		*
		* @suspend_noirq: Complete the actions started by @suspend(). Carry out any
		* additional operations required for suspending the device that might be
		* racing with its driver's interrupt handler, which is guaranteed not to
		@@ -158,9 +178,10 @@ typedef struct pm_message {
		* @suspend_noirq() has returned successfully. If the device can generate
		* system wakeup signals and is enabled to wake up the system, it should be
		* configured to do so at that time. However, depending on the platform
		* and device's subsystem, @suspend() may be allowed to put the device into
		* the low-power state and configure it to generate wakeup signals, in
		* which case it generally is not necessary to define @suspend_noirq().
		* and device's subsystem, @suspend() or @suspend_late() may be allowed to
		* put the device into the low-power state and configure it to generate
		* wakeup signals, in which case it generally is not necessary to define
		* @suspend_noirq().
		*
		* @resume_noirq: Prepare for the execution of @resume() by carrying out any
		* operations required for resuming the device that might be racing with
		@@ -171,9 +192,9 @@ typedef struct pm_message {
		* additional operations required for freezing the device that might be
		* racing with its driver's interrupt handler, which is guaranteed not to
		* run while @freeze_noirq() is being executed.
		* The power state of the device should not be changed by either @freeze()
		* or @freeze_noirq() and it should not be configured to signal system
		* wakeup by any of these callbacks.
		* The power state of the device should not be changed by either @freeze(),
		* or @freeze_late(), or @freeze_noirq() and it should not be configured to
		* signal system wakeup by any of these callbacks.
		*
		* @thaw_noirq: Prepare for the execution of @thaw() by carrying out any
		* operations required for thawing the device that might be racing with its
		@@ -249,6 +270,12 @@ struct dev_pm_ops {
		int (thaw)(struct device dev);
		int (poweroff)(struct device dev);
		int (restore)(struct device dev);
		int (suspend_late)(struct device dev);
		int (resume_early)(struct device dev);
		int (freeze_late)(struct device dev);
		int (thaw_early)(struct device dev);
		int (poweroff_late)(struct device dev);
		int (restore_early)(struct device dev);
		int (suspend_noirq)(struct device dev);
		int (resume_noirq)(struct device dev);
		int (freeze_noirq)(struct device dev);
		@@ -584,13 +611,13 @@ struct dev_pm_domain {

		#ifdef CONFIG_PM_SLEEP
		extern void device_pm_lock(void);
		extern void dpm_resume_noirq(pm_message_t state);
		extern void dpm_resume_start(pm_message_t state);
		extern void dpm_resume_end(pm_message_t state);
		extern void dpm_resume(pm_message_t state);
		extern void dpm_complete(pm_message_t state);

		extern void device_pm_unlock(void);
		extern int dpm_suspend_noirq(pm_message_t state);
		extern int dpm_suspend_end(pm_message_t state);
		extern int dpm_suspend_start(pm_message_t state);
		extern int dpm_suspend(pm_message_t state);
		extern int dpm_prepare(pm_message_t state);

Admin message