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

Commit 80f21b25 authored by Saravana Kannan's avatar Saravana Kannan
Browse files

BACKPORT: driver core: Look for waiting consumers only for a fwnode's primary device 



Commit 4dbe191c046e ("driver core: Add device links from fwnode only for
the primary device") skipped linking a fwnode's secondary device to
the suppliers listed in its fwnode.

However, a fwnode's secondary device can't be found using
get_dev_from_fwnode(). So, there's no point in trying to see if devices
waiting for suppliers might want to link to a fwnode's secondary device.

This commit removes that unnecessary step for devices that aren't a
fwnode's primary device and also moves the code to a more appropriate
part of the file.

Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20200515053500.215929-3-saravanak@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5f5377eaddfc24e5d7562e588d0ff84f9264d7c1)
[conflict fixes due to of_devlink rename to fw_devlink]
Bug: 157691602
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Change-Id: Id0455f6bc05d89b0f81d1574a242be6b8ff67975
parent efd676d5

drivers/base/core.c

+18 −10
Original line number Original line Diff line number Diff line
@@ -1165,6 +1165,21 @@ static void device_links_purge(struct device *dev) 
	device_links_write_unlock();

	device_links_write_unlock();

}

}





static void fw_devlink_link_device(struct device *dev)

{

	int fw_ret;



	device_link_add_missing_supplier_links();



	if (fwnode_has_op(dev->fwnode, add_links)) {

		fw_ret = fwnode_call_int_op(dev->fwnode, add_links, dev);

		if (fw_ret == -ENODEV)

			device_link_wait_for_mandatory_supplier(dev);

		else if (fw_ret)

			device_link_wait_for_optional_supplier(dev);

	}

}



/* Device links support end. */

/* Device links support end. */





int (*platform_notify)(struct device *dev) = NULL;

int (*platform_notify)(struct device *dev) = NULL;
@@ -2365,7 +2380,7 @@ int device_add(struct device *dev) 
	struct device *parent;

	struct device *parent;

	struct kobject *kobj;

	struct kobject *kobj;

	struct class_interface *class_intf;

	struct class_interface *class_intf;

	int error = -EINVAL, fw_ret;

	int error = -EINVAL;

	struct kobject *glue_dir = NULL;

	struct kobject *glue_dir = NULL;

	bool is_fwnode_dev = false;

	bool is_fwnode_dev = false;
@@ -2481,15 +2496,8 @@ int device_add(struct device *dev) 
	 * waiting consumers can link to it before the driver is bound to the

	 * waiting consumers can link to it before the driver is bound to the

	 * device and the driver sync_state callback is called for this device.

	 * device and the driver sync_state callback is called for this device.

	 */

	 */

	device_link_add_missing_supplier_links();

	if (is_fwnode_dev)



		fw_devlink_link_device(dev);

	if (is_fwnode_dev && fwnode_has_op(dev->fwnode, add_links)) {

		fw_ret = fwnode_call_int_op(dev->fwnode, add_links, dev);

		if (fw_ret == -ENODEV)

			device_link_wait_for_mandatory_supplier(dev);

		else if (fw_ret)

			device_link_wait_for_optional_supplier(dev);

	}





	bus_probe_device(dev);

	bus_probe_device(dev);

	if (parent)

	if (parent)