wifi: mt76: connac: add new definition of tx descriptor

Add MT_TXD6_MSDU_CNT_V2 bitfield, which is used by mt7992 chipsets.
This is a preliminary patch for mt7992 chipsets support.

Signed-off-by: Benjamin Lin <benjamin-jw.lin@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h
index 36edf1d3dfcaa9f4f6e7ce0016321adc691712e7..ecd7889209f3dc7dda551a814e5f6c35ae180e94 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h
@@ -245,6 +245,7 @@ enum tx_mgnt_type {
 #define MT_TXD6_TIMESTAMP_OFS_EN       BIT(15)
 #define MT_TXD6_TIMESTAMP_OFS_IDX      GENMASK(14, 10)
 #define MT_TXD6_MSDU_CNT               GENMASK(9, 4)
+#define MT_TXD6_MSDU_CNT_V2            GENMASK(15, 10)
 #define MT_TXD6_DIS_MAT                        BIT(3)
 #define MT_TXD6_DAS                    BIT(2)
 #define MT_TXD6_AMSDU_CAP              BIT(1)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 1cc573551bdf102b2b8434089d770e5846483875..ccdec1cc9b2c7be457b969adccec3619154230c9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -873,8 +873,11 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
                val |= MT_TXD5_TX_STATUS_HOST;
        txwi[5] = cpu_to_le32(val);
 
-       val = MT_TXD6_DIS_MAT | MT_TXD6_DAS |
-             FIELD_PREP(MT_TXD6_MSDU_CNT, 1);
+       val = MT_TXD6_DIS_MAT | MT_TXD6_DAS;
+       if (is_mt7996(&dev->mt76))
+               val |= FIELD_PREP(MT_TXD6_MSDU_CNT, 1);
+       else
+               val |= FIELD_PREP(MT_TXD6_MSDU_CNT_V2, 1);
        txwi[6] = cpu_to_le32(val);
        txwi[7] = 0;