Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9c4e06 authored Dec 13, 2017 by Russell King Committed by David S. Miller Dec 13, 2017

net: phy: marvell: avoid configuring fiber page for SGMII-to-Copper



When in SGMII-to-Copper mode, the fiber page is used for the MAC facing
link, and does not require configuration of the fiber auto-negotiation
settings.  Avoid trying.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 53c64870

drivers/net/phy/marvell.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -637,6 +637,10 @@ static int m88e1510_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)