Skip to content

Commit c14f07c

Browse files
Russell Kingdavem330
authored andcommitted
Revert "net: phy: marvell: avoid pause mode on SGMII-to-Copper for 88e151x"
This reverts commit 6623c0f. The original diagnosis was incorrect: it appears that the NIC had PHY polling mode enabled, which meant that it overwrote the PHYs advertisement register during negotiation. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Tested-by: Yonglong Liu <liuyonglong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent e7b8164 commit c14f07c

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

drivers/net/phy/marvell.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,6 @@ static int m88e1510_config_init(struct phy_device *phydev)
847847

848848
/* SGMII-to-Copper mode initialization */
849849
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
850-
851850
/* Select page 18 */
852851
err = marvell_set_page(phydev, 18);
853852
if (err < 0)
@@ -870,21 +869,6 @@ static int m88e1510_config_init(struct phy_device *phydev)
870869
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
871870
if (err < 0)
872871
return err;
873-
874-
/* There appears to be a bug in the 88e1512 when used in
875-
* SGMII to copper mode, where the AN advertisement register
876-
* clears the pause bits each time a negotiation occurs.
877-
* This means we can never be truely sure what was advertised,
878-
* so disable Pause support.
879-
*/
880-
linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
881-
phydev->supported);
882-
linkmode_clear_bit(ETHTOOL_LINK_MODE_Pause_BIT,
883-
phydev->supported);
884-
linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
885-
phydev->advertising);
886-
linkmode_clear_bit(ETHTOOL_LINK_MODE_Pause_BIT,
887-
phydev->advertising);
888872
}
889873

890874
return m88e1318_config_init(phydev);

0 commit comments

Comments
 (0)