| Message ID | E1dHq63-0005Wr-K2@rmk-PC.armlinux.org.uk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Jun 05, 2017 at 12:22:55PM +0100, Russell King wrote: > Avoid calling genphy_aneg_done() for PHYs that do not implement the > Clause 22 register set. > > Clause 45 PHYs may implement the Clause 22 register set along with the > Clause 22 extension MMD. Hence, we can't simply block access to the > Clause 22 functions based on the PHY being a Clause 45 PHY. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On 06/05/2017 04:22 AM, Russell King wrote: > Avoid calling genphy_aneg_done() for PHYs that do not implement the > Clause 22 register set. > > Clause 45 PHYs may implement the Clause 22 register set along with the > Clause 22 extension MMD. Hence, we can't simply block access to the > Clause 22 functions based on the PHY being a Clause 45 PHY. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 82ab8fb82587..788da83a5c7e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -163,6 +163,12 @@ int phy_aneg_done(struct phy_device *phydev) if (phydev->drv && phydev->drv->aneg_done) return phydev->drv->aneg_done(phydev); + /* Avoid genphy_aneg_done() if the Clause 45 PHY does not + * implement Clause 22 registers + */ + if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0))) + return -EINVAL; + return genphy_aneg_done(phydev); } EXPORT_SYMBOL(phy_aneg_done);
Avoid calling genphy_aneg_done() for PHYs that do not implement the Clause 22 register set. Clause 45 PHYs may implement the Clause 22 register set along with the Clause 22 extension MMD. Hence, we can't simply block access to the Clause 22 functions based on the PHY being a Clause 45 PHY. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/phy.c | 6 ++++++ 1 file changed, 6 insertions(+)