net: phy: prevent PHYs w/o Clause 22 regs from calling genphy_config_aneg

genphy_config_aneg() should be called only by PHYs that implement
the Clause 22 register set. Prevent Clause 45 PHYs that don't implement
the register set from calling the genphy function.

Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 914fe8e6ac8627f9d94c619748f275941d49e21a..04780db4c963b2398f01250cdc5107d085898399 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -471,8 +471,14 @@ static int phy_config_aneg(struct phy_device *phydev)
 {
        if (phydev->drv->config_aneg)
                return phydev->drv->config_aneg(phydev);
-       else
-               return genphy_config_aneg(phydev);
+
+       /* Clause 45 PHYs that don't implement Clause 22 registers are not
+        * allowed to call genphy_config_aneg()
+        */
+       if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0)))
+               return -EOPNOTSUPP;
+
+       return genphy_config_aneg(phydev);
 }
 
 /**