]> git.hungrycats.org Git - linux/commit
net: phy: Correctly process PHY_HALTED in phy_stop_machine()
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 28 Jul 2017 18:58:36 +0000 (11:58 -0700)
committerSasha Levin <alexander.levin@verizon.com>
Fri, 6 Oct 2017 16:53:16 +0000 (12:53 -0400)
commitef0680a31df994e1d77b840f37772ff727cdc8ca
tree6eef74fc9eda091ffeb40a174a2d5c418c138edb
parent99902f230d7a9b60849ec6f7817f3767d093897b
net: phy: Correctly process PHY_HALTED in phy_stop_machine()

[ 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: Sasha Levin <alexander.levin@verizon.com>
drivers/net/phy/phy.c