UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Heiner Kallweit 2017-11-30 23:57:00 +01:00 committed by David S. Miller
parent a6d1642dab
commit c34bc2b505
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/phy/phy.c
View File

@ -730,8 +730,9 @@ void phy_change(struct phy_device *phydev)
!phydev->drv->did_interrupt(phydev)) !phydev->drv->did_interrupt(phydev))
return; return;
if (phy_disable_interrupts(phydev)) if (phydev->state == PHY_HALTED)
goto phy_err; if (phy_disable_interrupts(phydev))
goto phy_err;
} }
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
@ -739,15 +740,11 @@ void phy_change(struct phy_device *phydev)
phydev->state = PHY_CHANGELINK; phydev->state = PHY_CHANGELINK;
mutex_unlock(&phydev->lock); 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 */ /* reschedule state queue work to run as soon as possible */
phy_trigger_machine(phydev, true); phy_trigger_machine(phydev, true);
if (phy_interrupt_is_valid(phydev) && phy_clear_interrupt(phydev))
goto phy_err;
return; return;
phy_err: phy_err:
@ -987,10 +984,6 @@ void phy_state_machine(struct work_struct *work)
phydev->state = PHY_NOLINK; phydev->state = PHY_NOLINK;
phy_link_down(phydev, true); phy_link_down(phydev, true);
} }
if (phy_interrupt_is_valid(phydev))
err = phy_config_interrupt(phydev,
PHY_INTERRUPT_ENABLED);
break; break;
case PHY_HALTED: case PHY_HALTED:
if (phydev->link) { if (phydev->link) {