[v2,2/2] net: phy: Don't miss phy_suspend() on PHY_HALTED for PHYs with interrupts

Message ID 1490180524-28675-3-git-send-email-rogerq@ti.com
State New
Headers show
  • net: phy: state machine fixes for interrupt driven PHYs
Related show

Commit Message

Roger Quadros March 22, 2017, 11:02 a.m.
phy_suspend() doesn't get called as part of phy_stop() for PHYs
using interrupts because the phy state machine is never triggered
after a phy_stop().

Explicitly trigger the PHY state machine in phy_stop() so that it can
see the new PHY state (HALTED) and suspend the PHY.

As most PHYLIB consumers will call phy_stop() with rtnl_lock() held
from ndo_close() so we use don't wait for workqueue cancellation in
phy_trigger_machine() by passing false for the 'sync' argument.

Fixes: 3c293f4e08b5 ("net: phy: Trigger state machine on state change and not polling.")
Cc: stable <stable@vger.kernel.org> # v4.9+
Signed-off-by: Roger Quadros <rogerq@ti.com>

 drivers/net/phy/phy.c | 1 +
 1 file changed, 1 insertion(+)



diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 49dedf8..ab14e7b 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -907,6 +907,7 @@  void phy_stop(struct phy_device *phydev)
 	 * of rtnl_lock(), but PHY_HALTED shall guarantee phy_change()
 	 * will not reenable interrupts.
+	phy_trigger_machine(phydev, false);