> When the wait for pending TX in mt76u_stop_tx() times out, its cleanup > parks the TX worker also where the caller parked it already. This is the > case for mt792xu_disconnect(), which reaches mt76u_stop_tx() through > mt76_unregister_device(), and for mt7921u_mac_reset() and > mt7925u_mac_reset(). The second park triggers a WARN, and the cleanup > then unparks the worker, which runs again during the teardown or the > chip reset: > > mt7925u 2-4:1.0: timed out waiting for pending tx > WARNING: CPU: 1 PID: 15805 at kthread_park+0x73/0x90 > Call Trace: > ... > mt792xu_stop+0x15/0x30 [mt792x_usb] > ... > drv_stop+0x33/0xd0 [mac80211] > ... > ieee80211_unregister_hw+0x45/0x140 [mac80211] > mt76_unregister_device+0x70/0xf0 [mt76] > mt792xu_disconnect+0x7a/0x1c0 [mt792x_usb] > ... > > Park and unpark the worker in the cleanup only while MT76_RESET is > clear, as mt792x_flush() does. Every caller that holds MT76_RESET has > parked the worker already, or runs before mt76_register_device() starts > it. > > Fixes: 7910bd565d8b ("wifi: mt76: mt792x: quiesce USB paths on disconnect") > Fixes: 0d2afe09fad5 ("mt76: mt7921: add mt7921u driver") > Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips") > Signed-off-by: Felix Fietkau Reviewed-by: Lorenzo Bianconi > --- > drivers/net/wireless/mediatek/mt76/usb.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c > index be48a88a3ad0..9a701840d23a 100644 > --- a/drivers/net/wireless/mediatek/mt76/usb.c > +++ b/drivers/net/wireless/mediatek/mt76/usb.c > @@ -1070,6 +1070,7 @@ void mt76u_stop_tx(struct mt76_dev *dev) > if (!ret) { > struct mt76_queue_entry entry; > struct mt76_queue *q; > + bool park; > int i, j; > > dev_err(dev->dev, "timed out waiting for pending tx\n"); > @@ -1083,7 +1084,9 @@ void mt76u_stop_tx(struct mt76_dev *dev) > usb_kill_urb(q->entry[j].urb); > } > > - mt76_worker_disable(&dev->tx_worker); > + park = !test_bit(MT76_RESET, &dev->phy.state); > + if (park) > + mt76_worker_disable(&dev->tx_worker); > > /* On device removal we maight queue skb's, but mt76u_tx_kick() > * will fail to submit urb, cleanup those skb's manually. > @@ -1100,7 +1103,8 @@ void mt76u_stop_tx(struct mt76_dev *dev) > } > } > > - mt76_worker_enable(&dev->tx_worker); > + if (park) > + mt76_worker_enable(&dev->tx_worker); > } > > cancel_work_sync(&dev->usb.stat_work); > -- > 2.47.3 > >