Commit a1fdbfbb authored Feb 01, 2019 by Rafael J. Wysocki Committed by Greg Kroah-Hartman Feb 01, 2019

driver core: Do not call rpm_put_suppliers() in pm_runtime_drop_link()

Calling rpm_put_suppliers() from pm_runtime_drop_link() is excessive
as it affects all suppliers of the consumer device and not just the
one pointed to by the device link being dropped. Worst case it may
cause the consumer device to stop working unexpectedly. Moreover, in
principle it is racy with respect to runtime PM of the consumer
device.

To avoid these problems drop runtime PM references on the particular
supplier pointed to by the link in question only and do that after
the link has been dropped from the consumer device's list of links to
suppliers, which is in device_link_free().

Fixes: a0504aec ("PM / runtime: Drop usage count for suppliers at device link removal")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 15cfb094

drivers/base/core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -374,6 +374,9 @@ EXPORT_SYMBOL_GPL(device_link_add);

		static void device_link_free(struct device_link *link)
		{
		while (refcount_dec_not_one(&link->rpm_active))
		pm_runtime_put(link->supplier);

		put_device(link->consumer);
		put_device(link->supplier);
		kfree(link);

drivers/base/power/runtime.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1611,8 +1611,6 @@ void pm_runtime_new_link(struct device *dev)

		void pm_runtime_drop_link(struct device *dev)
		{
		rpm_put_suppliers(dev);

		spin_lock_irq(&dev->power.lock);
		WARN_ON(dev->power.links_count == 0);
		dev->power.links_count--;

Admin message