net: phy: Allow mdio buses to auto-probe c45 devices

The mdiobus_scan logic is currently hardcoded to only
work with c22 devices. This works fairly well in most
cases, but its possible that a c45 device doesn't respond
despite being a standard phy. If the parent hardware
is capable, it makes sense to scan for c22 devices before
falling back to c45.

As we want this to reflect the capabilities of the STA,
lets add a field to the mii_bus structure to represent
the capability. That way devices can opt into the extended
scanning. Existing users should continue to default to c22
only scanning as long as they are zero'ing the structure
before use.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6ceee82b2839e37d61bb1398bfd380528ffd809b..ab9233c558d8a8d70b111580230e6896f4f7046c 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -739,10 +739,24 @@ EXPORT_SYMBOL(mdiobus_free);
  */
 struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
 {
-       struct phy_device *phydev;
+       struct phy_device *phydev = ERR_PTR(-ENODEV);
        int err;
 
-       phydev = get_phy_device(bus, addr, false);
+       switch (bus->probe_capabilities) {
+       case MDIOBUS_NO_CAP:
+       case MDIOBUS_C22:
+               phydev = get_phy_device(bus, addr, false);
+               break;
+       case MDIOBUS_C45:
+               phydev = get_phy_device(bus, addr, true);
+               break;
+       case MDIOBUS_C22_C45:
+               phydev = get_phy_device(bus, addr, false);
+               if (IS_ERR(phydev))
+                       phydev = get_phy_device(bus, addr, true);
+               break;
+       }
+
        if (IS_ERR(phydev))
                return phydev;
 

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 9248dd2ce4ca7fdca3c52ac82dc60854298a7dee..7860d56c6bf5bf550458a4ff71f874bedb03cbac 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -298,6 +298,14 @@ struct mii_bus {
        /* RESET GPIO descriptor pointer */
        struct gpio_desc *reset_gpiod;
 
+       /* bus capabilities, used for probing */
+       enum {
+               MDIOBUS_NO_CAP = 0,
+               MDIOBUS_C22,
+               MDIOBUS_C45,
+               MDIOBUS_C22_C45,
+       } probe_capabilities;
+
        /* protect access to the shared element */
        struct mutex shared_lock;