Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: phy: marvell: Ensure SGMII auto-negotiation is enabled for 88E1111

Browse Source 
When 88E1111 is operating in SGMII mode, auto-negotiation should be enabled
on the SGMII side so that the link will come up properly with PCSes which
normally have auto-negotiation enabled. This is normally the case when the
PHY defaults to SGMII mode at power-up, however if we switched it from some
other mode like 1000Base-X, as may happen in some SFP module situations,
it may not be, particularly for modules which have 1000Base-X
auto-negotiation defaulting to disabled.

Call genphy_check_and_restart_aneg on the fiber page to ensure that auto-
negotiation is properly enabled on the SGMII interface.

Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Robert Hancock 2021-02-16 14:53:30 -06:00 committed by David S. Miller
parent 884b6b8ab4
commit 06b334f08b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/phy/marvell.c
View File

@ -684,16 +684,19 @@ static int m88e1111_config_aneg(struct phy_device *phydev)
if (err < 0) if (err < 0)
goto error; goto error;
/* Do not touch the fiber page if we're in copper->sgmii mode */
if (phydev->interface == PHY_INTERFACE_MODE_SGMII)
return 0;
/* Then the fiber link */ /* Then the fiber link */
err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE);
if (err < 0) if (err < 0)
goto error; goto error;
err = marvell_config_aneg_fiber(phydev); if (phydev->interface == PHY_INTERFACE_MODE_SGMII)
/* Do not touch the fiber advertisement if we're in copper->sgmii mode.
* Just ensure that SGMII-side autonegotiation is enabled.
* If we switched from some other mode to SGMII it may not be.
*/
err = genphy_check_and_restart_aneg(phydev, false);
else
err = marvell_config_aneg_fiber(phydev);
if (err < 0) if (err < 0)
goto error; goto error;