Skip to content

Commit

Permalink
net: ethernet: mtk_eth_soc: remove cpu_relax in mtk_pending_work
Browse files Browse the repository at this point in the history
Get rid of cpu_relax in mtk_pending_work routine since MTK_RESETTING is
set only in mtk_pending_work() and it runs holding rtnl lock

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Lorenzo Bianconi authored and David S. Miller committed Nov 18, 2022
1 parent b677d6c commit ec8cd13
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/net/ethernet/mediatek/mtk_eth_soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3546,11 +3546,8 @@ static void mtk_pending_work(struct work_struct *work)
rtnl_lock();

dev_dbg(eth->dev, "[%s][%d] reset\n", __func__, __LINE__);
set_bit(MTK_RESETTING, &eth->state);

while (test_and_set_bit_lock(MTK_RESETTING, &eth->state))
cpu_relax();

dev_dbg(eth->dev, "[%s][%d] mtk_stop starts\n", __func__, __LINE__);
/* stop all devices to make sure that dma is properly shut down */
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i])
Expand Down Expand Up @@ -3584,7 +3581,7 @@ static void mtk_pending_work(struct work_struct *work)

dev_dbg(eth->dev, "[%s][%d] reset done\n", __func__, __LINE__);

clear_bit_unlock(MTK_RESETTING, &eth->state);
clear_bit(MTK_RESETTING, &eth->state);

rtnl_unlock();
}
Expand Down

0 comments on commit ec8cd13

Please sign in to comment.