| Message ID | E1cR5bt-0000O8-1T@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/10/2017 03:13 PM, Russell King wrote: > When an Marvell 88E1512 PHY is connected to a nic in SGMII mode, the > fiber page is used for the SGMII host-side connection. The PHY driver > notices that SUPPORTED_FIBRE is set, so it tries reading the fiber page > for the link status, and ends up reading the MAC-side status instead of > the outgoing (copper) link. This leads to incorrect results reported > via ethtool. > > If the PHY is connected via SGMII to the host, ignore the fiber page. > However, continue to allow the existing power management code to > suspend and resume the fiber page. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Fixes: 6cfb3bcc0641 ("Marvell phy: check link status in case of fiber link.")
From: Russell King <rmk+kernel@armlinux.org.uk> Date: Tue, 10 Jan 2017 23:13:45 +0000 > When an Marvell 88E1512 PHY is connected to a nic in SGMII mode, the > fiber page is used for the SGMII host-side connection. The PHY driver > notices that SUPPORTED_FIBRE is set, so it tries reading the fiber page > for the link status, and ends up reading the MAC-side status instead of > the outgoing (copper) link. This leads to incorrect results reported > via ethtool. > > If the PHY is connected via SGMII to the host, ignore the fiber page. > However, continue to allow the existing power management code to > suspend and resume the fiber page. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Applied, thanks Russell.
From: Florian Fainelli <f.fainelli@gmail.com> Date: Tue, 10 Jan 2017 15:24:11 -0800 > Fixes: 6cfb3bcc0641 ("Marvell phy: check link status in case of fiber > link.") Thanks, I added this to Russell's commit message.
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 6ad76829c7cd..04e439ad5cff 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1190,7 +1190,8 @@ static int marvell_read_status(struct phy_device *phydev) int err; /* Check the fiber mode first */ - if (phydev->supported & SUPPORTED_FIBRE) { + if (phydev->supported & SUPPORTED_FIBRE && + phydev->interface != PHY_INTERFACE_MODE_SGMII) { err = phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_M1111_FIBER); if (err < 0) goto error;
When an Marvell 88E1512 PHY is connected to a nic in SGMII mode, the fiber page is used for the SGMII host-side connection. The PHY driver notices that SUPPORTED_FIBRE is set, so it tries reading the fiber page for the link status, and ends up reading the MAC-side status instead of the outgoing (copper) link. This leads to incorrect results reported via ethtool. If the PHY is connected via SGMII to the host, ignore the fiber page. However, continue to allow the existing power management code to suspend and resume the fiber page. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/marvell.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)