Commit 45064d19 authored by Michael Lo's avatar Michael Lo Committed by Felix Fietkau
Browse files

wifi: mt76: mt7925: fix a potential association failure upon resuming 



In multi-channel scenarios, the granted channel must be aborted before
suspending. Otherwise, the firmware will be put into a wrong state,
resulting in an association failure after resuming.

With this patch, the granted channel will be aborted before suspending
if necessary.

Cc: stable@vger.kernel.org
Fixes: c948b5da ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Signed-off-by: default avatarMichael Lo <michael.lo@mediatek.com>
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Link: https://patch.msgid.link/20240902090054.15806-1-mingyen.hsieh@mediatek.com


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent bb6fe2b9

drivers/net/wireless/mediatek/mt76/mt7925/main.c

+15 −0
Original line number Diff line number Diff line
@@ -439,6 +439,19 @@ static void mt7925_roc_iter(void *priv, u8 *mac, 
	mt7925_mcu_abort_roc(phy, &mvif->bss_conf, phy->roc_token_id);

}



void mt7925_roc_abort_sync(struct mt792x_dev *dev)

{

	struct mt792x_phy *phy = &dev->phy;



	del_timer_sync(&phy->roc_timer);

	cancel_work_sync(&phy->roc_work);

	if (test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state))

		ieee80211_iterate_interfaces(mt76_hw(dev),

					     IEEE80211_IFACE_ITER_RESUME_ALL,

					     mt7925_roc_iter, (void *)phy);

}

EXPORT_SYMBOL_GPL(mt7925_roc_abort_sync);



void mt7925_roc_work(struct work_struct *work)

{

	struct mt792x_phy *phy;
@@ -1112,6 +1125,8 @@ static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev, 
	msta = (struct mt792x_sta *)link_sta->sta->drv_priv;

	mlink = mt792x_sta_to_link(msta, link_id);



	mt7925_roc_abort_sync(dev);



	mt76_connac_free_pending_tx_skbs(&dev->pm, &mlink->wcid);

	mt76_connac_pm_wake(&dev->mphy, &dev->pm);

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

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf, 
		       enum mt7925_roc_req type, u8 token_id);

int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,

			 u8 token_id);

void mt7925_roc_abort_sync(struct mt792x_dev *dev);

int mt7925_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,

			    int cmd, int *wait_seq);

int mt7925_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,

drivers/net/wireless/mediatek/mt76/mt7925/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ static int mt7925_pci_suspend(struct device *device) 
	cancel_delayed_work_sync(&pm->ps_work);

	cancel_work_sync(&pm->wake_work);



	mt7925_roc_abort_sync(dev);



	err = mt792x_mcu_drv_pmctrl(dev);

	if (err < 0)

		goto restore_suspend;