Commit 0940605a authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7921: fixup rx bitrate statistics 



Since the related rx bitrate fields have been moved to group3 in Rxv,
fix rx bitrate statistics in mt7921_mac_fill_rx routine.

Fixes: 163f4d22 ("mt76: mt7921: add MAC support")
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent a7e3033f

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

+78 −77
Original line number Diff line number Diff line
@@ -400,7 +400,9 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) 


	/* RXD Group 3 - P-RXV */

	if (rxd1 & MT_RXD1_NORMAL_GROUP_3) {

		u32 v0, v1, v2;

		u8 stbc, gi;

		u32 v0, v1;

		bool cck;



		rxv = rxd;

		rxd += 2;
@@ -409,7 +411,6 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) 


		v0 = le32_to_cpu(rxv[0]);

		v1 = le32_to_cpu(rxv[1]);

		v2 = le32_to_cpu(rxv[2]);



		if (v0 & MT_PRXV_HT_AD_CODE)

			status->enc_flags |= RX_ENC_FLAG_LDPC;
@@ -429,18 +430,12 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) 
					     status->chain_signal[i]);

		}



		/* RXD Group 5 - C-RXV */

		if (rxd1 & MT_RXD1_NORMAL_GROUP_5) {

			u8 stbc = FIELD_GET(MT_CRXV_HT_STBC, v2);

			u8 gi = FIELD_GET(MT_CRXV_HT_SHORT_GI, v2);

			bool cck = false;



			rxd += 18;

			if ((u8 *)rxd - skb->data >= skb->len)

				return -EINVAL;

		stbc = FIELD_GET(MT_PRXV_STBC, v0);

		gi = FIELD_GET(MT_PRXV_SGI, v0);

		cck = false;



		idx = i = FIELD_GET(MT_PRXV_TX_RATE, v0);

			mode = FIELD_GET(MT_CRXV_TX_MODE, v2);

		mode = FIELD_GET(MT_PRXV_TX_MODE, v0);



		switch (mode) {

		case MT_PHY_TYPE_CCK:
@@ -482,9 +477,10 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) 
		default:

			return -EINVAL;

		}



		status->rate_idx = i;



			switch (FIELD_GET(MT_CRXV_FRAME_MODE, v2)) {

		switch (FIELD_GET(MT_PRXV_FRAME_MODE, v0)) {

		case IEEE80211_STA_RX_BW_20:

			break;

		case IEEE80211_STA_RX_BW_40:
@@ -510,6 +506,11 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) 
		status->enc_flags |= RX_ENC_FLAG_STBC_MASK * stbc;

		if (mode < MT_PHY_TYPE_HE_SU && gi)

			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;



		if (rxd1 & MT_RXD1_NORMAL_GROUP_5) {

			rxd += 18;

			if ((u8 *)rxd - skb->data >= skb->len)

				return -EINVAL;

		}

	}

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

+8 −2
Original line number Diff line number Diff line
@@ -97,18 +97,24 @@ enum rx_pkt_type { 
#define MT_RXD3_NORMAL_PF_MODE		BIT(29)

#define MT_RXD3_NORMAL_PF_STS		GENMASK(31, 30)



/* P-RXV */

/* P-RXV DW0 */

#define MT_PRXV_TX_RATE			GENMASK(6, 0)

#define MT_PRXV_TX_DCM			BIT(4)

#define MT_PRXV_TX_ER_SU_106T		BIT(5)

#define MT_PRXV_NSTS			GENMASK(9, 7)

#define MT_PRXV_HT_AD_CODE		BIT(11)

#define MT_PRXV_FRAME_MODE		GENMASK(14, 12)

#define MT_PRXV_SGI			GENMASK(16, 15)

#define MT_PRXV_STBC			GENMASK(23, 22)

#define MT_PRXV_TX_MODE			GENMASK(27, 24)

#define MT_PRXV_HE_RU_ALLOC_L		GENMASK(31, 28)

#define MT_PRXV_HE_RU_ALLOC_H		GENMASK(3, 0)



/* P-RXV DW1 */

#define MT_PRXV_RCPI3			GENMASK(31, 24)

#define MT_PRXV_RCPI2			GENMASK(23, 16)

#define MT_PRXV_RCPI1			GENMASK(15, 8)

#define MT_PRXV_RCPI0			GENMASK(7, 0)

#define MT_PRXV_HE_RU_ALLOC_H		GENMASK(3, 0)



/* C-RXV */

#define MT_CRXV_HT_STBC			GENMASK(1, 0)