Commit f07ac384 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7921: avoid unnecessary consecutive WiFi resets 



Avoid unnecessary consecutive WiFi resets by dropping reset
request when reset work is working.

Co-developed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f011c369

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+4 −1
Original line number Diff line number Diff line
@@ -1312,6 +1312,7 @@ void mt7921_mac_reset_work(struct work_struct *work) 
	int i;



	dev_err(dev->mt76.dev, "chip reset\n");

	dev->hw_full_reset = true;

	ieee80211_stop_queues(hw);



	cancel_delayed_work_sync(&dev->mphy.mac_work);
@@ -1338,6 +1339,7 @@ void mt7921_mac_reset_work(struct work_struct *work) 
		ieee80211_scan_completed(dev->mphy.hw, &info);

	}



	dev->hw_full_reset = false;

	ieee80211_wake_queues(hw);

	ieee80211_iterate_active_interfaces(hw,

					    IEEE80211_IFACE_ITER_RESUME_ALL,
@@ -1349,6 +1351,7 @@ void mt7921_reset(struct mt76_dev *mdev) 
{

	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);



	if (!dev->hw_full_reset)

		queue_work(dev->mt76.wq, &dev->reset_work);

}

drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct mt7921_dev { 
	u16 chainmask;



	struct work_struct reset_work;

	bool hw_full_reset;



	struct list_head sta_poll_list;

	spinlock_t sta_poll_lock;