[PATCH] PCI / PM: Block races between runtime PM and system sleep

From: Rafael J. Wysocki
Date: Sun Jun 19 2011 - 15:48:39 EST

From: Rafael J. Wysocki <rjw@xxxxxxx>

After commit e8665002477f0278f84f898145b1f141ba26ee26
(PM: Allow pm_runtime_suspend() to succeed during system suspend) it
is possible that a device resumed by the pm_runtime_resume(dev) in
pci_pm_prepare() will be suspended immediately from a work item,
timer function or otherwise, defeating the very purpose of calling
pm_runtime_resume(dev) from there. To prevent that from happening
it is necessary to increment the runtime PM usage counter of the
device by replacing pm_runtime_resume() with pm_runtime_get_sync().
Moreover, the incremented runtime PM usage counter has to be
decremented by the corresponding pci_pm_complete(), via

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: stable@xxxxxxxxxx
drivers/pci/pci-driver.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/pci-driver.c
--- linux-2.6.orig/drivers/pci/pci-driver.c
+++ linux-2.6/drivers/pci/pci-driver.c
@@ -624,7 +624,7 @@ static int pci_pm_prepare(struct device
* system from the sleep state, we'll have to prevent it from signaling
* wake-up.
- pm_runtime_resume(dev);
+ pm_runtime_get_sync(dev);

if (drv && drv->pm && drv->pm->prepare)
error = drv->pm->prepare(dev);
@@ -638,6 +638,8 @@ static void pci_pm_complete(struct devic

if (drv && drv->pm && drv->pm->complete)
+ pm_runtime_put_noidle(dev);

#else /* !CONFIG_PM_SLEEP */
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/