net: phy: core: don't disable device interrupts in phy_change

If state is not PHY_HALTED I see no need to temporarily disable
interrupts on the device. As long as the current interrupt isn't acked
on the device no new interrupt can happen anyway.

In addition remove a unneeded enabling of interrupts in the state
machine when handling state PHY_CHANGELINK.

Tested on a Odroid-C2 with RTL8211F phy in interrupt mode.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 13 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index b410e0c17147..944143b521d7 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -730,8 +730,9 @@ void phy_change(struct phy_device *phydev)
                     !phydev->drv->did_interrupt(phydev))
                         return;
 
-                if (phy_disable_interrupts(phydev))
-                        goto phy_err;
+                if (phydev->state == PHY_HALTED)
+                        if (phy_disable_interrupts(phydev))
+                                goto phy_err;
         }
 
         mutex_lock(&phydev->lock);
@@ -739,15 +740,11 @@ void phy_change(struct phy_device *phydev)
                 phydev->state = PHY_CHANGELINK;
         mutex_unlock(&phydev->lock);
 
-        if (phy_interrupt_is_valid(phydev)) {
-                /* Reenable interrupts */
-                if (PHY_HALTED != phydev->state &&
-                    phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED))
-                        goto phy_err;
-        }
-
         /* reschedule state queue work to run as soon as possible */
         phy_trigger_machine(phydev, true);
+
+        if (phy_interrupt_is_valid(phydev) && phy_clear_interrupt(phydev))
+                goto phy_err;
         return;
 
 phy_err:
@@ -987,10 +984,6 @@ void phy_state_machine(struct work_struct *work)
                         phydev->state = PHY_NOLINK;
                         phy_link_down(phydev, true);
                 }
-
-                if (phy_interrupt_is_valid(phydev))
-                        err = phy_config_interrupt(phydev,
-                                                   PHY_INTERRUPT_ENABLED);
                 break;
         case PHY_HALTED:
                 if (phydev->link) {