nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

Browse source 
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>
This commit is contained in:
Camelia Groza 2018-07-23 18:06:15 +03:00 committed by David S. Miller
parent 7e50b2a51d
commit 34786005ec
1 changed files with 8 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/phy/phy.c
View file

@ -471,8 +471,14 @@ static int phy_config_aneg(struct phy_device *phydev)
{ {
if (phydev->drv->config_aneg) if (phydev->drv->config_aneg)
return phydev->drv->config_aneg(phydev); 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);
} }
/** /**