net: phy: Avoid polling PHY with PHY_IGNORE_INTERRUPTS (d5c3d846) · Commits · 戴 / test

Commit ("phy: fix the use of PHY_IGNORE_INTERRUPT") changed a hunk in phy_state_machine() in the PHY_RUNNING case which was not needed. The change essentially makes the PHY library treat PHY devices with PHY_IGNORE_INTERRUPT to keep polling for the PHY device, even though the intent is not to do it. Fix this by reverting that specific hunk, which makes the PHY state machine wait for state changes, and stay in the PHY_RUNNING state for as long as needed. Fixes: ("phy: fix the use of PHY_IGNORE_INTERRUPT") Signed-off-by:

Florian Fainelli <f.fainelli@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/phy.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -905,10 +905,10 @@ void phy_state_machine(struct work_struct *work)
		phydev->adjust_link(phydev->attached_dev);
		break;
		case PHY_RUNNING:
		/* Only register a CHANGE if we are polling or ignoring
		* interrupts and link changed since latest checking.
		/* Only register a CHANGE if we are polling and link changed
		* since latest checking.
		*/
		if (!phy_interrupt_is_valid(phydev)) {
		if (phydev->irq == PHY_POLL) {
		old_link = phydev->link;
		err = phy_read_status(phydev);
		if (err)
		@@ -1000,6 +1000,11 @@ void phy_state_machine(struct work_struct *work)
		phy_state_to_str(old_state),
		phy_state_to_str(phydev->state));

		/* Only re-schedule a PHY state machine change if we are polling the
		* PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving
		* between states from phy_mac_interrupt()
		*/
		if (phydev->irq == PHY_POLL)
		queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,
		PHY_STATE_TIME * HZ);
		}

Admin message