1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index bba0ca786aaa..49d9f0a789fe 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -538,9 +538,12 @@ void phy_stop_machine(struct phy_device *phydev)
         cancel_delayed_work_sync(&phydev->state_queue);
 
         mutex_lock(&phydev->lock);
-        if (phydev->state > PHY_UP)
+        if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
                 phydev->state = PHY_UP;
         mutex_unlock(&phydev->lock);
+
+        /* Now we can run the state machine synchronously */
+        phy_state_machine(&phydev->state_queue.work);
 }
 
 /**
@@ -918,6 +921,15 @@ void phy_state_machine(struct work_struct *work)
                         if (old_link != phydev->link)
                                 phydev->state = PHY_CHANGELINK;
                 }
+                /*
+                 * Failsafe: check that nobody set phydev->link=0 between two
+                 * poll cycles, otherwise we won't leave RUNNING state as long
+                 * as link remains down.
+                 */
+                if (!phydev->link && phydev->state == PHY_RUNNING) {
+                        phydev->state = PHY_CHANGELINK;
+                        dev_err(&phydev->dev, "no link in PHY_RUNNING\n");
+                }
                 break;
         case PHY_CHANGELINK:
                 err = phy_read_status(phydev);