Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c34bc2b5 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6d1642d

drivers/net/phy/phy.c

+6 −13
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ void phy_change(struct phy_device *phydev) 
		    !phydev->drv->did_interrupt(phydev))

			return;



		if (phydev->state == PHY_HALTED)

			if (phy_disable_interrupts(phydev))

				goto phy_err;

	}
@@ -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) {