Skip to content

Commit

Permalink
mt76: mt7921: avoid unnecessary consecutive WiFi resets
Browse files Browse the repository at this point in the history
[ Upstream commit f07ac38 ]

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

Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
moore-bros authored and gregkh committed Jul 14, 2021
1 parent 7c041b2 commit d262610
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/net/wireless/mediatek/mt76/mt7921/mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
hw = mt76_hw(dev);

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);
Expand All @@ -1296,6 +1297,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,
Expand All @@ -1306,7 +1308,8 @@ void mt7921_reset(struct mt76_dev *mdev)
{
struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);

queue_work(dev->mt76.wq, &dev->reset_work);
if (!dev->hw_full_reset)
queue_work(dev->mt76.wq, &dev->reset_work);
}

static void
Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d262610

Please sign in to comment.