Commit 8da77df6 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller

net: phy: always call phy_process_state_change() under lock

phy_stop() calls phy_process_state_change() while holding the phydev
lock, so also arrange for phy_state_machine() to do the same, so that
this function is called with consistent locking.
Tested-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 002841be
...@@ -1506,6 +1506,7 @@ void phy_state_machine(struct work_struct *work) ...@@ -1506,6 +1506,7 @@ void phy_state_machine(struct work_struct *work)
if (err < 0) if (err < 0)
phy_error_precise(phydev, func, err); phy_error_precise(phydev, func, err);
mutex_lock(&phydev->lock);
phy_process_state_change(phydev, old_state); phy_process_state_change(phydev, old_state);
/* Only re-schedule a PHY state machine change if we are polling the /* Only re-schedule a PHY state machine change if we are polling the
...@@ -1516,7 +1517,6 @@ void phy_state_machine(struct work_struct *work) ...@@ -1516,7 +1517,6 @@ void phy_state_machine(struct work_struct *work)
* state machine would be pointless and possibly error prone when * state machine would be pointless and possibly error prone when
* called from phy_disconnect() synchronously. * called from phy_disconnect() synchronously.
*/ */
mutex_lock(&phydev->lock);
if (phy_polling_mode(phydev) && phy_is_started(phydev)) if (phy_polling_mode(phydev) && phy_is_started(phydev))
phy_queue_state_machine(phydev, PHY_STATE_TIME); phy_queue_state_machine(phydev, PHY_STATE_TIME);
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment