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

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

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

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: Allow _put_sync() from interrupts-disabled context
  PM / Domains: Fix pm_genpd_poweron()
parents 2560540b 02b26774

Documentation/power/runtime_pm.txt

+5 −5
Original line number Diff line number Diff line
@@ -54,11 +54,10 @@ referred to as subsystem-level callbacks in what follows. 
By default, the callbacks are always invoked in process context with interrupts

enabled.  However, subsystems can use the pm_runtime_irq_safe() helper function

to tell the PM core that a device's ->runtime_suspend() and ->runtime_resume()

callbacks should be invoked in atomic context with interrupts disabled

(->runtime_idle() is still invoked the default way).  This implies that these

callback routines must not block or sleep, but it also means that the

synchronous helper functions listed at the end of Section 4 can be used within

an interrupt handler or in an atomic context.

callbacks should be invoked in atomic context with interrupts disabled.

This implies that these callback routines must not block or sleep, but it also

means that the synchronous helper functions listed at the end of Section 4 can

be used within an interrupt handler or in an atomic context.



The subsystem-level suspend callback is _entirely_ _responsible_ for handling

the suspend of the device as appropriate, which may, but need not include
@@ -483,6 +482,7 @@ pm_runtime_suspend() 
pm_runtime_autosuspend()

pm_runtime_resume()

pm_runtime_get_sync()

pm_runtime_put_sync()

pm_runtime_put_sync_suspend()



5. Runtime PM Initialization, Device Probing and Removal

drivers/base/power/domain.c

+1 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static void genpd_set_active(struct generic_pm_domain *genpd) 
int pm_genpd_poweron(struct generic_pm_domain *genpd)

{

	struct generic_pm_domain *parent = genpd->parent;

	DEFINE_WAIT(wait);

	int ret = 0;



 start:
@@ -112,7 +111,7 @@ int pm_genpd_poweron(struct generic_pm_domain *genpd) 
	}



	if (genpd->power_on) {

		int ret = genpd->power_on(genpd);

		ret = genpd->power_on(genpd);

		if (ret)

			goto out;

	}

drivers/base/power/runtime.c

+8 −2
Original line number Diff line number Diff line
@@ -226,10 +226,16 @@ static int rpm_idle(struct device *dev, int rpmflags) 
		callback = NULL;



	if (callback) {

		if (dev->power.irq_safe)

			spin_unlock(&dev->power.lock);

		else

			spin_unlock_irq(&dev->power.lock);



		callback(dev);



		if (dev->power.irq_safe)

			spin_lock(&dev->power.lock);

		else

			spin_lock_irq(&dev->power.lock);

	}