Commit 593c829b authored by Benjamin Lin's avatar Benjamin Lin Committed by Felix Fietkau
Browse files

wifi: mt76: mt7996: revise TXS size 



Size of MPDU/PPDU TXS is 12 DWs.
In mt7996/mt7992, last 4 DWs are reserved, so TXS size was mistakenly
considered to be 8 DWs. However, in mt7990, 9th DW of TXS starts to be used.

Signed-off-by: default avatarBenjamin Lin <benjamin-jw.lin@mediatek.com>
Link: https://patch.msgid.link/20250311103646.43346-1-nbd@nbd.name


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 6fc82f65

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

+3 −0
Original line number Diff line number Diff line
@@ -314,6 +314,9 @@ enum tx_frag_idx { 
#define MT_TXFREE_INFO_COUNT		GENMASK(27, 24)

#define MT_TXFREE_INFO_STAT		GENMASK(29, 28)



#define MT_TXS_HDR_SIZE			4 /* Unit: DW */

#define MT_TXS_SIZE			12 /* Unit: DW */



#define MT_TXS0_BW			GENMASK(31, 29)

#define MT_TXS0_TID			GENMASK(28, 26)

#define MT_TXS0_AMPDU			BIT(25)

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

+2 −2
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ bool mt7996_rx_check(struct mt76_dev *mdev, void *data, int len) 
		mt7996_mac_tx_free(dev, data, len);

		return false;

	case PKT_TYPE_TXS:

		for (rxd += 4; rxd + 8 <= end; rxd += 8)

		for (rxd += MT_TXS_HDR_SIZE; rxd + MT_TXS_SIZE <= end; rxd += MT_TXS_SIZE)

			mt7996_mac_add_txs(dev, rxd);

		return false;

	case PKT_TYPE_RX_FW_MONITOR:
@@ -1442,7 +1442,7 @@ void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, 
		mt7996_mcu_rx_event(dev, skb);

		break;

	case PKT_TYPE_TXS:

		for (rxd += 4; rxd + 8 <= end; rxd += 8)

		for (rxd += MT_TXS_HDR_SIZE; rxd + MT_TXS_SIZE <= end; rxd += MT_TXS_SIZE)

			mt7996_mac_add_txs(dev, rxd);

		dev_kfree_skb(skb);

		break;