The "broken-turn-around" property is documented in mdio.yaml for any MDIO device, but the MDIO core currently parses it only for PHY devices in fwnode_mdiobus_phy_device_register(). Non-PHY devices, such as DSA switches, are registered through of_mdiobus_register_device(), where the property is ignored, so MDIO bus drivers that rely on phy_ignore_ta_mask still treat the turn-around/read failure as an error. Parse the property in of_mdiobus_register_phy() and of_mdiobus_register_device() instead, so it is handled in one place for both PHYs and other MDIO devices, and drop it from fwnode_mdiobus_phy_device_register(). Signed-off-by: Bastian Germann --- drivers/net/mdio/fwnode_mdio.c | 3 --- drivers/net/mdio/of_mdio.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c index ba7091518265..129481e8a910 100644 --- a/drivers/net/mdio/fwnode_mdio.c +++ b/drivers/net/mdio/fwnode_mdio.c @@ -89,9 +89,6 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio, phy->irq = mdio->irq[addr]; } - if (fwnode_property_read_bool(child, "broken-turn-around")) - mdio->phy_ignore_ta_mask |= 1 << addr; - /* Associate the fwnode with the device structure so it * can be looked up later */ diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c index b8d298c04d3f..c03fcf34b3a6 100644 --- a/drivers/net/mdio/of_mdio.c +++ b/drivers/net/mdio/of_mdio.c @@ -46,6 +46,9 @@ EXPORT_SYMBOL(of_mdiobus_phy_device_register); static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *child, u32 addr) { + if (of_property_read_bool(child, "broken-turn-around")) + mdio->phy_ignore_ta_mask |= BIT(addr); + return fwnode_mdiobus_register_phy(mdio, of_fwnode_handle(child), addr); } @@ -56,6 +59,9 @@ static int of_mdiobus_register_device(struct mii_bus *mdio, struct mdio_device *mdiodev; int rc; + if (fwnode_property_read_bool(fwnode, "broken-turn-around")) + mdio->phy_ignore_ta_mask |= BIT(addr); + mdiodev = mdio_device_create(mdio, addr); if (IS_ERR(mdiodev)) return PTR_ERR(mdiodev);