Merge branch 'macb-fix-probing-of-PHY-not-described-in-the-dt' (a019739c) · Commits · 戴 / test

Antoine Tenart says: ==================== net: macb: fix probing of PHY not described in the dt The macb Ethernet driver supports various ways of referencing its network PHY. When a device tree is used the PHY can be referenced with a phy-handle or, if connected to its internal MDIO bus, described in a child node. Some platforms omitted the PHY description while connecting the PHY to the internal MDIO bus and in such cases the MDIO bus has to be scanned "manually" by the macb driver. Prior to the phylink conversion the driver registered the MDIO bus with of_mdiobus_register and then in case the PHY couldn't be retrieved using dt or using phy_find_first (because registering an MDIO bus with of_mdiobus_register masks all PHYs) the macb driver was "manually" scanning the MDIO bus (like mdiobus_register does). The phylink conversion did break this particular case but reimplementing the manual scan of the bus in the macb driver wouldn't be very clean. The solution seems to be registering the MDIO bus based on if the PHYs are described in the device tree or not. There are multiple ways to do this, none is perfect. I chose to check if any of the child nodes of the macb node was a network PHY and based on this to register the MDIO bus with the of_ helper or not. The drawback is boards referencing the PHY through phy-handle, would scan the entire MDIO bus of the macb at boot time (as the MDIO bus would be registered with mdiobus_register). For this solution to work properly of_mdiobus_child_is_phy has to be exported, which means the patch doing so has to be backported to -stable as well. Another possible solution could have been to simply check if the macb node has a child node by counting its sub-nodes. This isn't techically perfect, as there could be other sub-nodes (in practice this should be fine, fixed-link being taken care of in the driver). We could also simply s/of_mdiobus_register/mdiobus_register/ but that could break boards using the PHY description in child node as a selector (which really would be not a proper way to do this...). The real issue here being having PHYs not described in the dt but we have dt backward compatibility, so we have to live with that. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/cadence/macb_main.c

+23 −4

Original line number	Diff line number	Diff line
		@@ -664,9 +664,30 @@ static int macb_mii_probe(struct net_device *dev)
		return 0;
		}

		static int macb_mdiobus_register(struct macb *bp)
		{
		struct device_node child, np = bp->pdev->dev.of_node;

		/* Only create the PHY from the device tree if at least one PHY is
		* described. Otherwise scan the entire MDIO bus. We do this to support
		* old device tree that did not follow the best practices and did not
		* describe their network PHYs.
		*/
		for_each_available_child_of_node(np, child)
		if (of_mdiobus_child_is_phy(child)) {
		/* The loop increments the child refcount,
		* decrement it before returning.
		*/
		of_node_put(child);

		return of_mdiobus_register(bp->mii_bus, np);
		}

		return mdiobus_register(bp->mii_bus);
		}

		static int macb_mii_init(struct macb *bp)
		{
		struct device_node *np;
		int err = -ENXIO;

		/* Enable management port */
		@@ -688,9 +709,7 @@ static int macb_mii_init(struct macb *bp)

		dev_set_drvdata(&bp->dev->dev, bp->mii_bus);

		np = bp->pdev->dev.of_node;

		err = of_mdiobus_register(bp->mii_bus, np);
		err = macb_mdiobus_register(bp);
		if (err)
		goto err_out_free_mdiobus;

drivers/of/of_mdio.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ static const struct of_device_id whitelist_phys[] = {
		* A device which is not a phy is expected to have a compatible string
		* indicating what sort of device it is.
		*/
		static bool of_mdiobus_child_is_phy(struct device_node *child)
		bool of_mdiobus_child_is_phy(struct device_node *child)
		{
		u32 phy_id;

		@@ -187,6 +187,7 @@ static bool of_mdiobus_child_is_phy(struct device_node *child)

		return false;
		}
		EXPORT_SYMBOL(of_mdiobus_child_is_phy);

		/**
		* of_mdiobus_register - Register mii_bus and create PHYs from the device tree

include/linux/of_mdio.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <linux/of.h>

		#if IS_ENABLED(CONFIG_OF_MDIO)
		extern bool of_mdiobus_child_is_phy(struct device_node *child);
		extern int of_mdiobus_register(struct mii_bus mdio, struct device_node np);
		extern struct phy_device of_phy_find_device(struct device_node phy_np);
		extern struct phy_device of_phy_connect(struct net_device dev,
		@@ -54,6 +55,11 @@ static inline int of_mdio_parse_addr(struct device *dev,
		}

		#else /* CONFIG_OF_MDIO */
		static bool of_mdiobus_child_is_phy(struct device_node *child)
		{
		return false;
		}

		static inline int of_mdiobus_register(struct mii_bus mdio, struct device_node np)
		{
		/*

Admin message