DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM: runtime: add might_sleep to PM runtime functions

Browse Source 
The list of functions that can be called in atomic context is
non-intuitive (pm_runtime_put_sync can not, but
pm_runtime_put_sync_suspend can, if pm_runtime_irq_safe has
been called?).  The code is actively misleading - the entry
points all start with spin_lock_irqsave, suggesting they
are safe to call in atomic context, but may later
enable interrupts.

Add might_sleep_if to all the __pm_runtime_* entry points
to enforce correct usage.

Also add pm_runtime_put_sync_autosuspend to the list of
functions that can be called in atomic context.

Change-Id: Icac17a10d77c64d44bd2761a91a588dfd1d0c6f0
Signed-off-by: Colin Cross <ccross@android.com>
This commit is contained in:
Colin Cross
2011-08-10 11:41:59 -05:00
parent 3e59ce0fde
commit b1d0d5fe07
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/power/runtime_pm.txt
View File

@@ -469,6 +469,7 @@ pm_runtime_autosuspend()
pm_runtime_resume() pm_runtime_resume()
pm_runtime_get_sync() pm_runtime_get_sync()
pm_runtime_put_sync_suspend() pm_runtime_put_sync_suspend()
pm_runtime_put_sync_autosuspend()
5. Run-time PM Initialization, Device Probing and Removal 5. Run-time PM Initialization, Device Probing and Removal

9
drivers/base/power/runtime.c
View File

@@ -732,6 +732,8 @@ int __pm_runtime_idle(struct device *dev, int rpmflags)
unsigned long flags; unsigned long flags;
int retval; int retval;
might_sleep_if(!(rpmflags & RPM_ASYNC));
if (rpmflags & RPM_GET_PUT) { if (rpmflags & RPM_GET_PUT) {
if (!atomic_dec_and_test(&dev->power.usage_count)) if (!atomic_dec_and_test(&dev->power.usage_count))
return 0; return 0;
@@ -761,6 +763,8 @@ int __pm_runtime_suspend(struct device *dev, int rpmflags)
unsigned long flags; unsigned long flags;
int retval; int retval;
might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
if (rpmflags & RPM_GET_PUT) { if (rpmflags & RPM_GET_PUT) {
if (!atomic_dec_and_test(&dev->power.usage_count)) if (!atomic_dec_and_test(&dev->power.usage_count))
return 0; return 0;
@@ -789,6 +793,8 @@ int __pm_runtime_resume(struct device *dev, int rpmflags)
unsigned long flags; unsigned long flags;
int retval; int retval;
might_sleep_if(!(rpmflags & RPM_ASYNC) && !dev->power.irq_safe);
if (rpmflags & RPM_GET_PUT) if (rpmflags & RPM_GET_PUT)
atomic_inc(&dev->power.usage_count); atomic_inc(&dev->power.usage_count);
@@ -978,6 +984,7 @@ EXPORT_SYMBOL_GPL(pm_runtime_barrier);
*/ */
void __pm_runtime_disable(struct device *dev, bool check_resume) void __pm_runtime_disable(struct device *dev, bool check_resume)
{ {
might_sleep();
spin_lock_irq(&dev->power.lock); spin_lock_irq(&dev->power.lock);
if (dev->power.disable_depth > 0) { if (dev->power.disable_depth > 0) {
@@ -1184,6 +1191,8 @@ void __pm_runtime_use_autosuspend(struct device *dev, bool use)
{ {
int old_delay, old_use; int old_delay, old_use;
might_sleep();
spin_lock_irq(&dev->power.lock); spin_lock_irq(&dev->power.lock);
old_delay = dev->power.autosuspend_delay; old_delay = dev->power.autosuspend_delay;
old_use = dev->power.use_autosuspend; old_use = dev->power.use_autosuspend;