Merge branch 'net-phy-MDIO-bus-scanning-fixes' (cc26c9f5) · Commits · 戴 / test

Florian Fainelli says: ==================== net: phy: MDIO bus scanning fixes This patch series fixes two problems with the current MDIO bus scanning logic which was identified while moving from 4.9 to 5.4 on devices that do rely on scanning the MDIO bus at runtime because they use pluggable cards. Changes in v2: - added comment explaining the special value of -ENODEV - added Andrew's Reviewed-by tag ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/phy_device.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -794,8 +794,10 @@ static int get_phy_id(struct mii_bus bus, int addr, u32 phy_id,

		/* Grab the bits from PHYIR2, and put them in the lower half */
		phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);
		if (phy_reg < 0)
		return -EIO;
		if (phy_reg < 0) {
		/* returning -ENODEV doesn't stop bus scanning */
		return (phy_reg == -EIO \|\| phy_reg == -ENODEV) ? -ENODEV : -EIO;
		}

		*phy_id \|= phy_reg;

drivers/of/of_mdio.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -314,10 +314,15 @@ int of_mdiobus_register(struct mii_bus mdio, struct device_node np)
		child, addr);

		if (of_mdiobus_child_is_phy(child)) {
		/* -ENODEV is the return code that PHYLIB has
		* standardized on to indicate that bus
		* scanning should continue.
		*/
		rc = of_mdiobus_register_phy(mdio, child, addr);
		if (rc && rc != -ENODEV)
		goto unregister;
		if (!rc)
		break;
		if (rc != -ENODEV)
		goto unregister;
		}
		}
		}

Admin message