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

wifi: mt76: mt7996: fix HE and EHT beamforming capabilities 



Fix HE and EHT beamforming capabilities for different bands and
interface types.

Fixes: 98686cd2 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Fixes: 348533eb ("wifi: mt76: mt7996: add EHT capability init")
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/20240816094635.2391-5-shayne.chen@mediatek.com


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 948f6524

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

+43 −22
Original line number Diff line number Diff line
@@ -1012,8 +1012,6 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy, 
		return;



	elem->phy_cap_info[3] |= IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;

	if (vif == NL80211_IFTYPE_AP)

		elem->phy_cap_info[4] |= IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;



	c = FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,

		       sts - 1) |
@@ -1021,6 +1019,11 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy, 
		       sts - 1);

	elem->phy_cap_info[5] |= c;



	if (vif != NL80211_IFTYPE_AP)

		return;



	elem->phy_cap_info[4] |= IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;



	c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |

	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB;

	elem->phy_cap_info[6] |= c;
@@ -1180,7 +1183,6 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band, 
		IEEE80211_EHT_MAC_CAP0_OM_CONTROL;



	eht_cap_elem->phy_cap_info[0] =

		IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ |

		IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |

		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |

		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;
@@ -1194,30 +1196,36 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band, 
		u8_encode_bits(u8_get_bits(val, GENMASK(2, 1)),

			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK) |

		u8_encode_bits(val,

			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK) |

		u8_encode_bits(val,

			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK);

			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_160MHZ_MASK);



	eht_cap_elem->phy_cap_info[2] =

		u8_encode_bits(sts - 1, IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_80MHZ_MASK) |

		u8_encode_bits(sts - 1, IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK) |

		u8_encode_bits(sts - 1, IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK);

		u8_encode_bits(sts - 1, IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_160MHZ_MASK);



	if (band == NL80211_BAND_6GHZ) {

		eht_cap_elem->phy_cap_info[0] |=

			IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;



		eht_cap_elem->phy_cap_info[1] |=

			u8_encode_bits(val,

				       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_320MHZ_MASK);



		eht_cap_elem->phy_cap_info[2] |=

			u8_encode_bits(sts - 1,

				       IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK);

	}



	eht_cap_elem->phy_cap_info[3] =

		IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK |

		IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |

		IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |

		IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |

		IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK |

		IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK |

		IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK;

		IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK;



	eht_cap_elem->phy_cap_info[4] =

		u8_encode_bits(min_t(int, sts - 1, 2),

			       IEEE80211_EHT_PHY_CAP4_MAX_NC_MASK);



	eht_cap_elem->phy_cap_info[5] =

		IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |

		u8_encode_bits(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US,

			       IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK) |

		u8_encode_bits(u8_get_bits(0x11, GENMASK(1, 0)),
@@ -1231,14 +1239,6 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band, 
			       IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK) |

		u8_encode_bits(val, IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK);



	eht_cap_elem->phy_cap_info[7] =

		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |

		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |

		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ |

		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |

		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |

		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ;



	val = u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_RX) |

	      u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_TX);

#define SET_EHT_MAX_NSS(_bw, _val) do {				\
@@ -1249,8 +1249,29 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band, 


	SET_EHT_MAX_NSS(80, val);

	SET_EHT_MAX_NSS(160, val);

	if (band == NL80211_BAND_6GHZ)

		SET_EHT_MAX_NSS(320, val);

#undef SET_EHT_MAX_NSS



	if (iftype != NL80211_IFTYPE_AP)

		return;



	eht_cap_elem->phy_cap_info[3] |=

		IEEE80211_EHT_PHY_CAP3_TRIG_SU_BF_FDBK |

		IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK;



	eht_cap_elem->phy_cap_info[7] =

		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ |

		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ |

		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |

		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ;



	if (band != NL80211_BAND_6GHZ)

		return;



	eht_cap_elem->phy_cap_info[7] |=

		IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ |

		IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ;

}



static void