Commit 8536ef0a authored by Ming Yen Hsieh's avatar Ming Yen Hsieh Committed by Felix Fietkau
Browse files

wifi: mt76: mt7925: add support to set ifs time by mcu command 



There's a race between driver and fw on some tx/rx control registers
when setting ifs, which will cause accidental hw queue pause problems.
Avoid this by setting ifs time with bss_info mcu command.

Fixes: c948b5da ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Co-developed-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9300ae0c

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

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static void mt7925_bss_info_changed(struct ieee80211_hw *hw, 


		if (slottime != phy->slottime) {

			phy->slottime = slottime;

			mt792x_mac_set_timeing(phy);

			mt7925_mcu_set_timing(phy, vif);

		}

	}

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

+33 −0
Original line number Diff line number Diff line
@@ -2244,6 +2244,38 @@ mt7925_mcu_bss_color_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
		vif->bss_conf.he_bss_color.color : 0;

}



static void

mt7925_mcu_bss_ifs_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)

{

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

	struct mt792x_phy *phy = mvif->phy;

	struct bss_ifs_time_tlv *ifs_time;

	struct tlv *tlv;



	tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_IFS_TIME, sizeof(*ifs_time));

	ifs_time = (struct bss_ifs_time_tlv *)tlv;

	ifs_time->slot_valid = true;

	ifs_time->slot_time = cpu_to_le16(phy->slottime);

}



int mt7925_mcu_set_timing(struct mt792x_phy *phy,

			  struct ieee80211_vif *vif)

{

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

	struct mt792x_dev *dev = phy->dev;

	struct sk_buff *skb;



	skb = __mt7925_mcu_alloc_bss_req(&dev->mt76, &mvif->mt76,

					 MT7925_BSS_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	mt7925_mcu_bss_ifs_tlv(skb, vif);



	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_UNI_CMD(BSS_INFO_UPDATE), true);

}



int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,

			    struct ieee80211_chanctx_conf *ctx,

			    struct ieee80211_vif *vif,
@@ -2268,6 +2300,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy, 
	mt7925_mcu_bss_bmc_tlv(skb, phy, ctx, vif, sta);

	mt7925_mcu_bss_qos_tlv(skb, vif);

	mt7925_mcu_bss_mld_tlv(skb, vif, sta);

	mt7925_mcu_bss_ifs_tlv(skb, vif);



	if (vif->bss_conf.he_support) {

		mt7925_mcu_bss_he_tlv(skb, vif, phy);

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

+19 −0
Original line number Diff line number Diff line
@@ -440,6 +440,22 @@ struct sta_rec_mld { 
	} __packed link[2];

} __packed;



struct bss_ifs_time_tlv {

	__le16 tag;

	__le16 len;

	u8 slot_valid;

	u8 sifs_valid;

	u8 rifs_valid;

	u8 eifs_valid;

	__le16 slot_time;

	__le16 sifs_time;

	__le16 rifs_time;

	__le16 eifs_time;

	u8 eifs_cck_valid;

	u8 rsv;

	__le16 eifs_cck_time;

} __packed;



#define MT7925_STA_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +		\

					 sizeof(struct sta_rec_basic) +		\

					 sizeof(struct sta_rec_bf) +		\
@@ -467,6 +483,7 @@ struct sta_rec_mld { 
					 sizeof(struct bss_mld_tlv) +			\

					 sizeof(struct bss_info_uni_he) +		\

					 sizeof(struct bss_info_uni_bss_color) +	\

					 sizeof(struct bss_ifs_time_tlv) +		\

					 sizeof(struct tlv))



#define MT_CONNAC3_SKU_POWER_LIMIT      449
@@ -564,6 +581,8 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy, 
			    struct ieee80211_vif *vif,

			    struct ieee80211_sta *sta,

			    int enable);

int mt7925_mcu_set_timing(struct mt792x_phy *phy,

			  struct ieee80211_vif *vif);

int mt7925_mcu_set_deep_sleep(struct mt792x_dev *dev, bool enable);

int mt7925_mcu_set_channel_domain(struct mt76_phy *phy);

int mt7925_mcu_set_radio_en(struct mt792x_phy *phy, bool enable);