Commit 6e19b350 authored Sep 14, 2023 by Russell King (Oracle) Committed by David S. Miller Sep 17, 2023

net: phy: move phy_suspend() to end of phy_state_machine()



Move the call to phy_suspend() to the end of phy_state_machine() after
we release the lock so that we can combine the locked areas.
phy_suspend() can not be called while holding phydev->lock as it has
caused deadlocks in the past.

Tested-by: Jijie Shao <shaojijie@huawei.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ea5968cd

drivers/net/phy/phy.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -1494,15 +1494,11 @@ void phy_state_machine(struct work_struct *work)
		func = &_phy_start_aneg;
		}

		if (err == -ENODEV) {
		mutex_unlock(&phydev->lock);

		if (do_suspend)
		phy_suspend(phydev);

		if (err == -ENODEV)
		return;
		}

		mutex_lock(&phydev->lock);
		if (err < 0)
		phy_error_precise(phydev, func, err);

		@@ -1519,6 +1515,9 @@ void phy_state_machine(struct work_struct *work)
		if (phy_polling_mode(phydev) && phy_is_started(phydev))
		phy_queue_state_machine(phydev, PHY_STATE_TIME);
		mutex_unlock(&phydev->lock);

		if (do_suspend)
		phy_suspend(phydev);
		}

		/**