Commit 355c060d authored by Deren Wu's avatar Deren Wu Committed by Felix Fietkau
Browse files

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



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

Fixes: 48fab5bb ("mt76: mt7921: introduce mt7921s support")
Tested-by: default avatarSean Wang <sean.wang@mediatek.com>
Co-developed-by: default avatarLeon Yen <Leon.Yen@mediatek.com>
Signed-off-by: default avatarLeon Yen <Leon.Yen@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Acked-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b962252b

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

+9 −3
Original line number Diff line number Diff line
@@ -918,9 +918,15 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi, 
		txwi[3] |= 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,

drivers/net/wireless/mediatek/mt76/mt7921/mac.h

+3 −0
Original line number Diff line number Diff line
@@ -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)