Commit 5b205575 authored by Howard Hsu's avatar Howard Hsu Committed by Felix Fietkau
Browse files

wifi: mt76: connac: adjust phy capabilities based on band constraints 



Adjust HE and EHT phy capabilities based on the band constraints.
For 2g band, we shall not enable the capabilities above 40MHz.

Signed-off-by: default avatarHoward Hsu <howard-yh.hsu@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Link: https://patch.msgid.link/20250114101026.3587702-5-shayne.chen@mediatek.com


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5c2a25a1

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

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm) 
	mutex_unlock(&dev->mutex);

}



void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss);

void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss, enum nl80211_band band);

int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,

			       int ring_base, void *wed, u32 flags);

drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c

+5 −2
Original line number Diff line number Diff line
@@ -9,10 +9,13 @@ 
#define HE_PREP(f, m, v)	le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\

						 IEEE80211_RADIOTAP_HE_##f)



void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss)

void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss, enum nl80211_band band)

{

	static const u8 ppet16_ppet8_ru3_ru0[] = { 0x1c, 0xc7, 0x71 };

	u8 i, ppet_bits, ppet_size, ru_bit_mask = 0x7; /* HE80 */

	u8 i, ppet_bits, ppet_size, ru_bit_mask = 0xf;



	if (band == NL80211_BAND_2GHZ)

		ru_bit_mask = 0x3;



	he_ppet[0] = FIELD_PREP(IEEE80211_PPE_THRES_NSS_MASK, nss - 1) |

		     FIELD_PREP(IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK,

drivers/net/wireless/mediatek/mt76/mt7915/init.c

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, 
		memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));

		if (he_cap_elem->phy_cap_info[6] &

		    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {

			mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss);

			mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss, band);

		} else {

			he_cap_elem->phy_cap_info[9] |=

				u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ mt7921_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band, 
		memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));

		if (he_cap_elem->phy_cap_info[6] &

		    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {

			mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss);

			mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss, band);

		} else {

			he_cap_elem->phy_cap_info[9] |=

				u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,

drivers/net/wireless/mediatek/mt76/mt7925/main.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ mt7925_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band, 


	if (he_cap_elem->phy_cap_info[6] &

	    IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {

		mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss);

		mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss, band);

	} else {

		he_cap_elem->phy_cap_info[9] |=

			u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,