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

Commit 5e64fb89 authored by Saravana Kannan's avatar Saravana Kannan
Browse files

ANDROID: of: property: Make sure child dependencies don't block probing of parent 



When creating device links to proxy the sync_state() needs of child
dependencies, create SYNC_STATE_ONLY device links so that children
dependencies don't block probing of the parent.

Also, differentiate between missing suppliers of parent device vs
missing suppliers of child devices so that driver core doesn't block
parent device probing when only child supplier dependencies are missing.

Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Bug: 142657042
Change-Id: Ifc63e36f6af6f48ec77215d0a2a609ff768e0fcb
(cherry-picked from android-mainline)
Conflicts: drivers/of/property.c
[Fixed conflict due to absence of DL_FLAG_AUTOPROBE_CONSUMER]
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
parent 82c1ffc6

drivers/of/property.c

+12 −5
Original line number Diff line number Diff line
@@ -1018,10 +1018,10 @@ static bool of_is_ancestor_of(struct device_node *test_ancestor, 
 * - -EINVAL if the supplier link is invalid and should not be created

 * - -ENODEV if there is no device that corresponds to the supplier phandle

 */

static int of_link_to_phandle(struct device *dev, struct device_node *sup_np)

static int of_link_to_phandle(struct device *dev, struct device_node *sup_np,

			      u32 dl_flags)

{

	struct device *sup_dev;

	u32 dl_flags = 0;

	int ret = 0;

	struct device_node *tmp_np = sup_np;
@@ -1189,13 +1189,20 @@ static int of_link_property(struct device *dev, struct device_node *con_np, 
	unsigned int i = 0;

	bool matched = false;

	int ret = 0;

	u32 dl_flags;



	if (dev->of_node == con_np)

		dl_flags = 0;

	else

		dl_flags = DL_FLAG_SYNC_STATE_ONLY;



	/* Do not stop at first failed link, link all available suppliers. */

	while (!matched && s->parse_prop) {

		while ((phandle = s->parse_prop(con_np, prop_name, i))) {

			matched = true;

			i++;

			if (of_link_to_phandle(dev, phandle) == -EAGAIN)

			if (of_link_to_phandle(dev, phandle, dl_flags)

								== -EAGAIN)

				ret = -EAGAIN;

			of_node_put(phandle);

		}
@@ -1213,10 +1220,10 @@ static int of_link_to_suppliers(struct device *dev, 


	for_each_property_of_node(con_np, p)

		if (of_link_property(dev, con_np, p->name))

			ret = -EAGAIN;

			ret = -ENODEV;



	for_each_child_of_node(con_np, child)

		if (of_link_to_suppliers(dev, child))

		if (of_link_to_suppliers(dev, child) && !ret)

			ret = -EAGAIN;



	return ret;