| From foo@baz Tue Aug 8 16:51:58 PDT 2017 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Fri, 28 Jul 2017 11:58:36 -0700 |
| Subject: net: phy: Correctly process PHY_HALTED in phy_stop_machine() |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| |
| [ Upstream commit 7ad813f208533cebfcc32d3d7474dc1677d1b09a ] |
| |
| 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: a390d1f379cf ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/phy/phy.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/net/phy/phy.c |
| +++ b/drivers/net/phy/phy.c |
| @@ -541,6 +541,9 @@ void phy_stop_machine(struct phy_device |
| 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); |
| } |
| |
| /** |
