Commit 342fa196 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

mdio: mux: make child bus walking more permissive and errors more verbose 



If any errors are encountered while walking the device tree structure of
the MDIO bus for children, the code may silently continue, silently
exit, or throw an error and exit.  This make it difficult for device
tree writers to know there is an error.  Also, it makes any error in a
child entry of the MDIO bus be fatal for all entries.  Instead, we
should provide verbose errors describing the error and then attempt to
continue if it all possible.  Also, use of_mdio_parse_addr()

Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8317a40

drivers/net/phy/mdio-mux.c

+17 −7
Original line number Original line Diff line number Diff line
@@ -135,27 +135,33 @@ int mdio_mux_init(struct device *dev, 
	for_each_available_child_of_node(dev->of_node, child_bus_node) {

	for_each_available_child_of_node(dev->of_node, child_bus_node) {

		u32 v;

		u32 v;





		r = of_property_read_u32(child_bus_node, "reg", &v);

		v = of_mdio_parse_addr(dev, child_bus_node);

		if (r)

		if (v < 0) {

			dev_err(dev,

				"Error: Failed to find reg for child %s\n",

				of_node_full_name(child_bus_node));

			continue;

			continue;

		}





		cb = devm_kzalloc(dev, sizeof(*cb), GFP_KERNEL);

		cb = devm_kzalloc(dev, sizeof(*cb), GFP_KERNEL);

		if (cb == NULL) {

		if (cb == NULL) {

			dev_err(dev,

			dev_err(dev,

				"Error: Failed to allocate memory for child\n");

				"Error: Failed to allocate memory for child %s\n",

				of_node_full_name(child_bus_node));

			ret_val = -ENOMEM;

			ret_val = -ENOMEM;

			of_node_put(child_bus_node);

			continue;

			break;

		}

		}

		cb->bus_number = v;

		cb->bus_number = v;

		cb->parent = pb;

		cb->parent = pb;





		cb->mii_bus = mdiobus_alloc();

		cb->mii_bus = mdiobus_alloc();

		if (!cb->mii_bus) {

		if (!cb->mii_bus) {

			dev_err(dev,

				"Error: Failed to allocate MDIO bus for child %s\n",

				of_node_full_name(child_bus_node));

			ret_val = -ENOMEM;

			ret_val = -ENOMEM;

			devm_kfree(dev, cb);

			devm_kfree(dev, cb);

			of_node_put(child_bus_node);

			continue;

			break;

		}

		}

		cb->mii_bus->priv = cb;

		cb->mii_bus->priv = cb;
@@ -167,6 +173,9 @@ int mdio_mux_init(struct device *dev, 
		cb->mii_bus->write = mdio_mux_write;

		cb->mii_bus->write = mdio_mux_write;

		r = of_mdiobus_register(cb->mii_bus, child_bus_node);

		r = of_mdiobus_register(cb->mii_bus, child_bus_node);

		if (r) {

		if (r) {

			dev_err(dev,

				"Error: Failed to register MDIO bus for child %s\n",

				of_node_full_name(child_bus_node));

			mdiobus_free(cb->mii_bus);

			mdiobus_free(cb->mii_bus);

			devm_kfree(dev, cb);

			devm_kfree(dev, cb);

		} else {

		} else {
@@ -180,6 +189,7 @@ int mdio_mux_init(struct device *dev, 
		return 0;

		return 0;

	}

	}





	dev_err(dev, "Error: No acceptable child buses found\n");

	devm_kfree(dev, pb);

	devm_kfree(dev, pb);

err_pb_kz:

err_pb_kz:

	/* balance the reference of_mdio_find_bus() took */

	/* balance the reference of_mdio_find_bus() took */

CRA Git | Maintained and supported by SUSTech CRA and CCSE