[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1eP3Ep-0000ZC-UN@rmk-PC.armlinux.org.uk>
Date: Wed, 13 Dec 2017 09:22:03 +0000
From: Russell King <rmk+kernel@...linux.org.uk>
To: Andrew Lunn <andrew@...n.ch>,
Florian Fainelli <f.fainelli@...il.com>
Cc: Jon Nettleton <jon@...id-run.com>, netdev@...r.kernel.org
Subject: [PATCH] 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@...linux.org.uk>
---
drivers/net/phy/marvell.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 1e3996b41af5..710110ead6ad 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -678,6 +678,10 @@ static int m88e1510_config_aneg(struct phy_device *phydev)
if (err < 0)
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 */
err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE);
if (err < 0)
--
2.7.4
Powered by blists - more mailing lists