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

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
...@@ -1312,6 +1312,7 @@ void mt7921_mac_reset_work(struct work_struct *work) ...@@ -1312,6 +1312,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
int i; int i;
dev_err(dev->mt76.dev, "chip reset\n"); dev_err(dev->mt76.dev, "chip reset\n");
dev->hw_full_reset = true;
ieee80211_stop_queues(hw); ieee80211_stop_queues(hw);
cancel_delayed_work_sync(&dev->mphy.mac_work); cancel_delayed_work_sync(&dev->mphy.mac_work);
...@@ -1338,6 +1339,7 @@ void mt7921_mac_reset_work(struct work_struct *work) ...@@ -1338,6 +1339,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
ieee80211_scan_completed(dev->mphy.hw, &info); ieee80211_scan_completed(dev->mphy.hw, &info);
} }
dev->hw_full_reset = false;
ieee80211_wake_queues(hw); ieee80211_wake_queues(hw);
ieee80211_iterate_active_interfaces(hw, ieee80211_iterate_active_interfaces(hw,
IEEE80211_IFACE_ITER_RESUME_ALL, IEEE80211_IFACE_ITER_RESUME_ALL,
...@@ -1349,6 +1351,7 @@ void mt7921_reset(struct mt76_dev *mdev) ...@@ -1349,6 +1351,7 @@ void mt7921_reset(struct mt76_dev *mdev)
{ {
struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
if (!dev->hw_full_reset)
queue_work(dev->mt76.wq, &dev->reset_work); queue_work(dev->mt76.wq, &dev->reset_work);
} }
......
...@@ -156,6 +156,7 @@ struct mt7921_dev { ...@@ -156,6 +156,7 @@ struct mt7921_dev {
u16 chainmask; u16 chainmask;
struct work_struct reset_work; struct work_struct reset_work;
bool hw_full_reset;
struct list_head sta_poll_list; struct list_head sta_poll_list;
spinlock_t sta_poll_lock; spinlock_t sta_poll_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