Skip to content

Commit 408566d

Browse files
Benjamin Linnbd168
authored andcommitted
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>
1 parent 8df63a4 commit 408566d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ enum tx_mgnt_type {
245245
#define MT_TXD6_TIMESTAMP_OFS_EN BIT(15)
246246
#define MT_TXD6_TIMESTAMP_OFS_IDX GENMASK(14, 10)
247247
#define MT_TXD6_MSDU_CNT GENMASK(9, 4)
248+
#define MT_TXD6_MSDU_CNT_V2 GENMASK(15, 10)
248249
#define MT_TXD6_DIS_MAT BIT(3)
249250
#define MT_TXD6_DAS BIT(2)
250251
#define MT_TXD6_AMSDU_CAP BIT(1)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,11 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
873873
val |= MT_TXD5_TX_STATUS_HOST;
874874
txwi[5] = cpu_to_le32(val);
875875

876-
val = MT_TXD6_DIS_MAT | MT_TXD6_DAS |
877-
FIELD_PREP(MT_TXD6_MSDU_CNT, 1);
876+
val = MT_TXD6_DIS_MAT | MT_TXD6_DAS;
877+
if (is_mt7996(&dev->mt76))
878+
val |= FIELD_PREP(MT_TXD6_MSDU_CNT, 1);
879+
else
880+
val |= FIELD_PREP(MT_TXD6_MSDU_CNT_V2, 1);
878881
txwi[6] = cpu_to_le32(val);
879882
txwi[7] = 0;
880883

0 commit comments

Comments
 (0)