| From 4dde35f480e8bdf961911d07a49c5443cc0c8e6a Mon Sep 17 00:00:00 2001 |
| From: Howard Hsu <howard-yh.hsu@mediatek.com> |
| Date: Tue, 27 Feb 2024 14:50:20 +0800 |
| Subject: [PATCH 007/116] mtk: wifi: mt76: mt7996: adjust Beamformee SS |
| capability |
| |
| This commit includes two changes to adjust beamformee ss capability. |
| First, configure the beamformee ss capability for mt7992 chipsets. |
| Second, no matter how many antenna numbers is set, always set the |
| maximum capability of Beamformee SS that chipsets support. |
| |
| Signed-off-by: Howard Hsu <howard-yh.hsu@mediatek.com> |
| CR-Id: WCNCR00240772 |
| Change-Id: I8a7efedbb02790925affdd3b4d81b623f459589c |
| --- |
| mt7996/init.c | 23 +++++++++++++++++------ |
| 1 file changed, 17 insertions(+), 6 deletions(-) |
| |
| diff --git a/mt7996/init.c b/mt7996/init.c |
| index c264d5043..ab9445cc3 100644 |
| --- a/mt7996/init.c |
| +++ b/mt7996/init.c |
| @@ -940,8 +940,12 @@ void mt7996_set_stream_vht_txbf_caps(struct mt7996_phy *phy) |
| cap = &phy->mt76->sband_5g.sband.vht_cap.cap; |
| |
| *cap |= IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE | |
| - IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE | |
| - FIELD_PREP(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK, sts - 1); |
| + IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE; |
| + |
| + if (is_mt7996(phy->mt76->dev)) |
| + *cap |= FIELD_PREP(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK, 3); |
| + else |
| + *cap |= FIELD_PREP(IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK, 4); |
| |
| *cap &= ~(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK | |
| IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE | |
| @@ -986,9 +990,15 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy, |
| IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO; |
| elem->phy_cap_info[2] |= c; |
| |
| - c = IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE | |
| - IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 | |
| - IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4; |
| + c = IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE; |
| + |
| + if (is_mt7996(phy->mt76->dev)) |
| + c |= IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 | |
| + IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4; |
| + else |
| + c |= IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_5 | |
| + IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_5; |
| + |
| elem->phy_cap_info[4] |= c; |
| |
| /* do not support NG16 due to spec D4.0 changes subcarrier idx */ |
| @@ -1185,7 +1195,8 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band, |
| IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER | |
| IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE; |
| |
| - val = max_t(u8, sts - 1, 3); |
| + /* Set the maximum capability regardless of the antenna configuration. */ |
| + val = is_mt7992(phy->mt76->dev) ? 4 : 3; |
| eht_cap_elem->phy_cap_info[0] |= |
| u8_encode_bits(u8_get_bits(val, BIT(0)), |
| IEEE80211_EHT_PHY_CAP0_BEAMFORMEE_SS_80MHZ_MASK); |
| -- |
| 2.39.2 |
| |