Patch "net: phy: marvell: fix Marvell 88E1512 used in SGMII mode" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

net: phy: marvell: fix Marvell 88E1512 used in SGMII mode

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     net-phy-marvell-fix-marvell-88e1512-used-in-sgmii-mode.patch

and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Russell King <[email protected]>
Date: Tue, 10 Jan 2017 23:13:45 +0000
Subject: net: phy: marvell: fix Marvell 88E1512 used in SGMII mode

From: Russell King <[email protected]>

[ Upstream commit a13c06525ab9ff442924e67df9393a5efa914c56 ]

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.

---
 drivers/net/phy/marvell.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -1200,7 +1200,8 @@ static int marvell_read_status(struct ph
 	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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/net-phy-marvell-fix-marvell-88e1512-used-in-sgmii-mode.patch