Commit 7ad813f2 authored Jul 28, 2017 by Florian Fainelli Committed by David S. Miller Jul 31, 2017

net: phy: Correctly process PHY_HALTED in phy_stop_machine()



Marc reported that he was not getting the PHY library adjust_link()
callback function to run when calling phy_stop() + phy_disconnect()
which does not indeed happen because we set the state machine to
PHY_HALTED but we don't get to run it to process this state past that
point.

Fix this with a synchronous call to phy_state_machine() in order to have
the state machine actually act on PHY_HALTED, set the PHY device's link
down, turn the network device's carrier off and finally call the
adjust_link() function.

Reported-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Fixes: a390d1f3 ("phylib: convert state_queue work to delayed_work")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 96a734ba

drivers/net/phy/phy.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -749,6 +749,9 @@ void phy_stop_machine(struct phy_device *phydev)
		if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
		phydev->state = PHY_UP;
		mutex_unlock(&phydev->lock);

		/* Now we can run the state machine synchronously */
		phy_state_machine(&phydev->state_queue.work);
		}

		/**

Admin message