mt76: mt7921s: fix missing fc type/sub-type for 802.11 pkts

[ Upstream commit 355c060d5f38a784822d544e969121a273bcf545 ]

For non-mmio devices, should set fc values to proper txwi config

Fixes: 48fab5bbef40 ("mt76: mt7921: introduce mt7921s support")
Tested-by: Sean Wang <sean.wang@mediatek.com>
Co-developed-by: Leon Yen <Leon.Yen@mediatek.com>
Signed-off-by: Leon Yen <Leon.Yen@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index ea5ae0fc8f549c5db03e80551ea4269dbadc6263..57fd626b40da98ced172cae7e2f7340dd82d040c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -836,9 +836,15 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi,
                txwi[3] |= cpu_to_le32(val);
        }
 
-       val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
-             FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);
-       txwi[7] |= cpu_to_le32(val);
+       if (mt76_is_mmio(&dev->mt76)) {
+               val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
+                     FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype);
+               txwi[7] |= cpu_to_le32(val);
+       } else {
+               val = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |
+                     FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);
+               txwi[8] |= cpu_to_le32(val);
+       }
 }
 
 void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
index 544a1c33126a45a22a952b926d19a09b4f0c160b..12e1cf8abe6ea78783e3e64bbcf3811a9d4def71 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h
@@ -284,6 +284,9 @@ enum tx_mcu_port_q_idx {
 #define MT_TXD7_HW_AMSDU               BIT(10)
 #define MT_TXD7_TX_TIME                        GENMASK(9, 0)
 
+#define MT_TXD8_L_TYPE                 GENMASK(5, 4)
+#define MT_TXD8_L_SUB_TYPE             GENMASK(3, 0)
+
 #define MT_TX_RATE_STBC                        BIT(13)
 #define MT_TX_RATE_NSS                 GENMASK(12, 10)
 #define MT_TX_RATE_MODE                        GENMASK(9, 6)