Commit 9b11696e authored by Peter Chiu's avatar Peter Chiu Committed by Felix Fietkau
Browse files

wifi: mt76: mt7996: fix wmm queue mapping 



Firmware uses access class index (ACI) for wmm parameters update, so
convert mac80211 queue to ACI in mt7996_conf_tx().

Fixes: 98686cd2 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by: default avatarPeter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent e1902810

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

+9 −3
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw, 
	mvif->mt76.omac_idx = idx;

	mvif->phy = phy;

	mvif->mt76.band_idx = band_idx;

	mvif->mt76.wmm_idx = band_idx;

	mvif->mt76.wmm_idx = vif->type != NL80211_IFTYPE_AP;



	ret = mt7996_mcu_add_dev_info(phy, vif, true);

	if (ret)
@@ -414,10 +414,16 @@ mt7996_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	       const struct ieee80211_tx_queue_params *params)

{

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

	const u8 mq_to_aci[] = {

		[IEEE80211_AC_VO] = 3,

		[IEEE80211_AC_VI] = 2,

		[IEEE80211_AC_BE] = 0,

		[IEEE80211_AC_BK] = 1,

	};



	/* firmware uses access class index */

	mvif->queue_params[mq_to_aci[queue]] = *params;

	/* no need to update right away, we'll get BSS_CHANGED_QOS */

	queue = mt76_connac_lmac_mapping(queue);

	mvif->queue_params[queue] = *params;



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -2679,7 +2679,7 @@ int mt7996_mcu_set_tx(struct mt7996_dev *dev, struct ieee80211_vif *vif) 


		e = (struct edca *)tlv;

		e->set = WMM_PARAM_SET;

		e->queue = ac + mvif->mt76.wmm_idx * MT7996_MAX_WMM_SETS;

		e->queue = ac;

		e->aifs = q->aifs;

		e->txop = cpu_to_le16(q->txop);