[PATCH 3.12 70/86] net: phy: handle state correctly in phy_stop_machine

From: Jiri Slaby
Date: Thu May 04 2017 - 05:12:15 EST

From: Nathan Sullivan <nathan.sullivan@xxxxxx>

3.12-stable review patch. If anyone has any objections, please let me know.


[ Upstream commit 49d52e8108a21749dc2114b924c907db43358984 ]

If the PHY is halted on stop, then do not set the state to PHY_UP. This
ensures the phy will be restarted later in phy_start when the machine is
started again.

Fixes: 00db8189d984 ("This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details.")
Signed-off-by: Nathan Sullivan <nathan.sullivan@xxxxxx>
Signed-off-by: Brad Mouring <brad.mouring@xxxxxx>
Acked-by: Xander Huff <xander.huff@xxxxxx>
Acked-by: Kyle Roeschley <kyle.roeschley@xxxxxx>
Reviewed-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
drivers/net/phy/phy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 0bc73f2c24ba..eca07101dc0c 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -473,7 +473,7 @@ void phy_stop_machine(struct phy_device *phydev)

- if (phydev->state > PHY_UP)
+ if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
phydev->state = PHY_UP;