wifi: mt76: mt7996: let non-bufferable MMPDUs use correct hw queue

[ Upstream commit d0b6f86fdbefa62fd4ad2acd1aea6c45f9b518ba ]

Pass qid into mt7996_mac_write_txwi() to let the tx descriptor of
non-bufferable MMPDUs be filled with correct hw queue index.

Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index c4567641210b13b7f9b59c033ce7ad92dbb2aaac..17f0b287507d7c5ff8d6def7df97c8576bde1b7e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -962,8 +962,9 @@ mt7996_mac_write_txwi_80211(struct mt7996_dev *dev, __le32 *txwi,
 }
 
 void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
-                          struct sk_buff *skb, struct mt76_wcid *wcid, int pid,
-                          struct ieee80211_key_conf *key, u32 changed)
+                          struct sk_buff *skb, struct mt76_wcid *wcid,
+                          struct ieee80211_key_conf *key, int pid,
+                          enum mt76_txq_id qid, u32 changed)
 {
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_vif *vif = info->control.vif;
@@ -994,7 +995,7 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
        } else if (beacon) {
                p_fmt = MT_TX_TYPE_FW;
                q_idx = MT_LMAC_BCN0;
-       } else if (skb_get_queue_mapping(skb) >= MT_TXQ_PSD) {
+       } else if (qid >= MT_TXQ_PSD) {
                p_fmt = MT_TX_TYPE_CT;
                q_idx = MT_LMAC_ALTX0;
        } else {
@@ -1103,8 +1104,8 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        memset(txwi_ptr, 0, MT_TXD_SIZE);
        /* Transmit non qos data by 802.11 header and need to fill txd by host*/
        if (!is_8023 || pid >= MT_PACKET_ID_FIRST)
-               mt7996_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, pid,
-                                     key, 0);
+               mt7996_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key,
+                                     pid, qid, 0);
 
        txp = (struct mt7996_txp *)(txwi + MT_TXD_SIZE);
        for (i = 0; i < nbuf; i++) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index d593ed9e3f73cb69f2ff494ca93a6778c04b2456..18c4e7bc4370d9d8d67c74994aec1d126ed45758 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -1804,8 +1804,9 @@ mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif,
        }
 
        buf = (u8 *)bcn + sizeof(*bcn) - MAX_BEACON_SIZE;
-       mt7996_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, 0, NULL,
+       mt7996_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, NULL, 0, 0,
                              BSS_CHANGED_BEACON);
+
        memcpy(buf + MT_TXD_SIZE, skb->data, skb->len);
 }
 
@@ -1995,8 +1996,7 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,
 
        buf = (u8 *)tlv + sizeof(*discov) - MAX_INBAND_FRAME_SIZE;
 
-       mt7996_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, 0, NULL,
-                             changed);
+       mt7996_mac_write_txwi(dev, (__le32 *)buf, skb, wcid, NULL, 0, 0, changed);
 
        memcpy(buf + MT_TXD_SIZE, skb->data, skb->len);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 725344791b4cdeebc5c2bddf938e5039732c42d4..e8eedae78479fcb60863896bb11e3213f239695c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -472,8 +472,9 @@ void mt7996_mac_enable_nf(struct mt7996_dev *dev, u8 band);
 void mt7996_mac_enable_rtscts(struct mt7996_dev *dev,
                              struct ieee80211_vif *vif, bool enable);
 void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
-                          struct sk_buff *skb, struct mt76_wcid *wcid, int pid,
-                          struct ieee80211_key_conf *key, u32 changed);
+                          struct sk_buff *skb, struct mt76_wcid *wcid,
+                          struct ieee80211_key_conf *key, int pid,
+                          enum mt76_txq_id qid, u32 changed);
 void mt7996_mac_set_timing(struct mt7996_phy *phy);
 int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
                       struct ieee80211_sta *sta);