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

mt76: mt7921: fix inappropriate WoW setup with the missing ARP informaiton 



Fix the Wake-on-WoWLAN failure should rely on ARP Information is being
updated in time to the firmware.

Fixes: ffa1bf97 ("mt76: mt7921: introduce PM support")
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f2d167c7

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

+3 −0
Original line number Diff line number Diff line
@@ -626,6 +626,9 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_ASSOC)

		mt7921_bss_bcnft_apply(dev, vif, info->assoc);



	if (changed & BSS_CHANGED_ARP_FILTER)

		mt7921_mcu_update_arp_filter(hw, vif, info);



	mt7921_mutex_release(dev);

}

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

+44 −0
Original line number Diff line number Diff line
@@ -1325,3 +1325,47 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
		mt76_clear(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);

	}

}



int mt7921_mcu_update_arp_filter(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *info)

{

	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct sk_buff *skb;

	int i, len = min_t(int, info->arp_addr_cnt,

			   IEEE80211_BSS_ARP_ADDR_LIST_LEN);

	struct {

		struct {

			u8 bss_idx;

			u8 pad[3];

		} __packed hdr;

		struct mt76_connac_arpns_tlv arp;

	} req_hdr = {

		.hdr = {

			.bss_idx = mvif->mt76.idx,

		},

		.arp = {

			.tag = cpu_to_le16(UNI_OFFLOAD_OFFLOAD_ARP),

			.len = cpu_to_le16(sizeof(struct mt76_connac_arpns_tlv)),

			.ips_num = len,

			.mode = 2,  /* update */

			.option = 1,

		},

	};



	skb = mt76_mcu_msg_alloc(&dev->mt76, NULL,

				 sizeof(req_hdr) + len * sizeof(__be32));

	if (!skb)

		return -ENOMEM;



	skb_put_data(skb, &req_hdr, sizeof(req_hdr));

	for (i = 0; i < len; i++) {

		u8 *addr = (u8 *)skb_put(skb, sizeof(__be32));



		memcpy(addr, &info->arp_addr_list[i], sizeof(__be32));

	}



	return mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_UNI_CMD_OFFLOAD,

				     true);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -348,4 +348,7 @@ int mt7921_mac_set_beacon_filter(struct mt7921_phy *phy, 
				 bool enable);

void mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif);

void mt7921_coredump_work(struct work_struct *work);

int mt7921_mcu_update_arp_filter(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *info);

#endif