1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index b9192ae92e40..f794ff3a10c2 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1815,13 +1815,25 @@ EXPORT_SYMBOL(genphy_read_status);
  */
 int genphy_soft_reset(struct phy_device *phydev)
 {
+        u16 res = BMCR_RESET;
         int ret;
 
-        ret = phy_set_bits(phydev, MII_BMCR, BMCR_RESET);
+        if (phydev->autoneg == AUTONEG_ENABLE)
+                res |= BMCR_ANRESTART;
+
+        ret = phy_modify(phydev, MII_BMCR, BMCR_ISOLATE, res);
         if (ret < 0)
                 return ret;
 
-        return phy_poll_reset(phydev);
+        ret = phy_poll_reset(phydev);
+        if (ret)
+                return ret;
+
+        /* BMCR may be reset to defaults */
+        if (phydev->autoneg == AUTONEG_DISABLE)
+                ret = genphy_setup_forced(phydev);
+
+        return ret;
 }
 EXPORT_SYMBOL(genphy_soft_reset);