Skip to content

Commit

Permalink
net: phy: lan87xx: fix access to wrong register of LAN87xx
Browse files Browse the repository at this point in the history
The function lan87xx_config_aneg_ext was introduced to configure
LAN95xxA but as well writes to undocumented register of LAN87xx.
This fix prevents that access.

The function lan87xx_config_aneg_ext gets more suitable for the new
behavior name.

Reported-by: Måns Rullgård <mans@mansr.com>
Fixes: 05b35e7 ("smsc95xx: add phylib support")
Signed-off-by: Andre Edich <andre.edich@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andre Edich authored and David S. Miller committed Mar 30, 2021
1 parent 9c0ee08 commit fdb5cc6
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/phy/smsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,13 @@ static int lan87xx_config_aneg(struct phy_device *phydev)
return genphy_config_aneg(phydev);
}

static int lan87xx_config_aneg_ext(struct phy_device *phydev)
static int lan95xx_config_aneg_ext(struct phy_device *phydev)
{
int rc;

if (phydev->phy_id != 0x0007c0f0) /* not (LAN9500A or LAN9505A) */
return lan87xx_config_aneg(phydev);

/* Extend Manual AutoMDIX timer */
rc = phy_read(phydev, PHY_EDPD_CONFIG);
if (rc < 0)
Expand Down Expand Up @@ -441,7 +444,7 @@ static struct phy_driver smsc_phy_driver[] = {
.read_status = lan87xx_read_status,
.config_init = smsc_phy_config_init,
.soft_reset = smsc_phy_reset,
.config_aneg = lan87xx_config_aneg_ext,
.config_aneg = lan95xx_config_aneg_ext,

/* IRQ related */
.config_intr = smsc_phy_config_intr,
Expand Down

0 comments on commit fdb5cc6

Please sign in to comment.