Commit 23f0dac8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core fixes from Greg KH:
 "So, turns out the kobject fix didn't quite work, so here are four
  patches that in the end, result in just two driver core fixes for
  reported issues that no one has had problems with.

  The kobject patch that was originally in here has now been reverted,
  as Guenter reported boot problems with it on some of his systems"

* tag 'driver-core-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  Revert "kobject: Make sure the parent does not get released before its children"
  kobject: Make sure the parent does not get released before its children
  driver core: Fix handling of SYNC_STATE_ONLY + STATELESS device links
  driver core: Fix SYNC_STATE_ONLY device link implementation
parents 0e36fd45 e6764aa0

drivers/base/core.c

+37 −18
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ struct device_link *device_link_add(struct device *consumer, 
				link->flags |= DL_FLAG_STATELESS;

				goto reorder;

			} else {

				link->flags |= DL_FLAG_STATELESS;

				goto out;

			}

		}
@@ -433,12 +434,16 @@ struct device_link *device_link_add(struct device *consumer, 
	    flags & DL_FLAG_PM_RUNTIME)

		pm_runtime_resume(supplier);



	list_add_tail_rcu(&link->s_node, &supplier->links.consumers);

	list_add_tail_rcu(&link->c_node, &consumer->links.suppliers);



	if (flags & DL_FLAG_SYNC_STATE_ONLY) {

		dev_dbg(consumer,

			"Linked as a sync state only consumer to %s\n",

			dev_name(supplier));

		goto out;

	}



reorder:

	/*

	 * Move the consumer and all of the devices depending on it to the end
@@ -449,9 +454,6 @@ reorder: 
	 */

	device_reorder_to_tail(consumer, NULL);



	list_add_tail_rcu(&link->s_node, &supplier->links.consumers);

	list_add_tail_rcu(&link->c_node, &consumer->links.suppliers);



	dev_dbg(consumer, "Linked as a consumer to %s\n", dev_name(supplier));



out:
@@ -829,6 +831,13 @@ static void __device_links_supplier_defer_sync(struct device *sup) 
		list_add_tail(&sup->links.defer_sync, &deferred_sync);

}



static void device_link_drop_managed(struct device_link *link)

{

	link->flags &= ~DL_FLAG_MANAGED;

	WRITE_ONCE(link->status, DL_STATE_NONE);

	kref_put(&link->kref, __device_link_del);

}



/**

 * device_links_driver_bound - Update device links after probing its driver.

 * @dev: Device to update the links for.
@@ -842,7 +851,7 @@ static void __device_links_supplier_defer_sync(struct device *sup) 
 */

void device_links_driver_bound(struct device *dev)

{

	struct device_link *link;

	struct device_link *link, *ln;

	LIST_HEAD(sync_list);



	/*
@@ -882,18 +891,35 @@ void device_links_driver_bound(struct device *dev) 
	else

		__device_links_queue_sync_state(dev, &sync_list);



	list_for_each_entry(link, &dev->links.suppliers, c_node) {

	list_for_each_entry_safe(link, ln, &dev->links.suppliers, c_node) {

		struct device *supplier;



		if (!(link->flags & DL_FLAG_MANAGED))

			continue;



		supplier = link->supplier;

		if (link->flags & DL_FLAG_SYNC_STATE_ONLY) {

			/*

			 * When DL_FLAG_SYNC_STATE_ONLY is set, it means no

			 * other DL_MANAGED_LINK_FLAGS have been set. So, it's

			 * save to drop the managed link completely.

			 */

			device_link_drop_managed(link);

		} else {

			WARN_ON(link->status != DL_STATE_CONSUMER_PROBE);

			WRITE_ONCE(link->status, DL_STATE_ACTIVE);

		}



		/*

		 * This needs to be done even for the deleted

		 * DL_FLAG_SYNC_STATE_ONLY device link in case it was the last

		 * device link that was preventing the supplier from getting a

		 * sync_state() call.

		 */

		if (defer_sync_state_count)

			__device_links_supplier_defer_sync(link->supplier);

			__device_links_supplier_defer_sync(supplier);

		else

			__device_links_queue_sync_state(link->supplier,

							&sync_list);

			__device_links_queue_sync_state(supplier, &sync_list);

	}



	dev->links.status = DL_DEV_DRIVER_BOUND;
@@ -903,13 +929,6 @@ void device_links_driver_bound(struct device *dev) 
	device_links_flush_sync_list(&sync_list, dev);

}



static void device_link_drop_managed(struct device_link *link)

{

	link->flags &= ~DL_FLAG_MANAGED;

	WRITE_ONCE(link->status, DL_STATE_NONE);

	kref_put(&link->kref, __device_link_del);

}



/**

 * __device_links_no_driver - Update links of a device without a driver.

 * @dev: Device without a drvier.

CRA Git | Maintained and supported by SUSTech CRA and CCSE