mt76: mt7915: update HE capabilities

Sync from SDK to update HE capabilities.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index aadf56e80bae8db076d6358e693ac8673d8c36e4..e90d0087e377c16791a653aa10250ea3087ab8df 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -417,11 +417,6 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
 
                he_cap_elem->mac_cap_info[0] =
                        IEEE80211_HE_MAC_CAP0_HTC_HE;
-               he_cap_elem->mac_cap_info[1] =
-                       IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_0US |
-                       IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_1;
-               he_cap_elem->mac_cap_info[2] =
-                       IEEE80211_HE_MAC_CAP2_BSR;
                he_cap_elem->mac_cap_info[3] =
                        IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
                        IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_RESERVED;
@@ -443,27 +438,27 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
                        IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |
                        IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ;
 
-               /* TODO: OFDMA */
-
                switch (i) {
                case NL80211_IFTYPE_AP:
                        he_cap_elem->mac_cap_info[0] |=
                                IEEE80211_HE_MAC_CAP0_TWT_RES;
+                       he_cap_elem->mac_cap_info[2] |=
+                               IEEE80211_HE_MAC_CAP2_BSR;
                        he_cap_elem->mac_cap_info[4] |=
                                IEEE80211_HE_MAC_CAP4_BQR;
+                       he_cap_elem->mac_cap_info[5] |=
+                               IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX;
                        he_cap_elem->phy_cap_info[3] |=
                                IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |
                                IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;
                        he_cap_elem->phy_cap_info[6] |=
                                IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
-                       he_cap_elem->phy_cap_info[9] |=
-                               IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;
                        break;
                case NL80211_IFTYPE_STATION:
                        he_cap_elem->mac_cap_info[0] |=
                                IEEE80211_HE_MAC_CAP0_TWT_REQ;
-                       he_cap_elem->mac_cap_info[3] |=
-                               IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED;
+                       he_cap_elem->mac_cap_info[1] |=
+                               IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US;
 
                        if (band == NL80211_BAND_2GHZ)
                                he_cap_elem->phy_cap_info[0] |=
@@ -473,18 +468,31 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
                                        IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G;
 
                        he_cap_elem->phy_cap_info[1] |=
-                               IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A;
+                               IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
+                               IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US;
+                       he_cap_elem->phy_cap_info[3] |=
+                               IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK |
+                               IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK;
+                       he_cap_elem->phy_cap_info[6] |=
+                               IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |
+                               IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE |
+                               IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
+                       he_cap_elem->phy_cap_info[7] |=
+                               IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
+                               IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI;
                        he_cap_elem->phy_cap_info[8] |=
                                IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
                                IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
-                               IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;
+                               IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |
+                               IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484;
                        he_cap_elem->phy_cap_info[9] |=
-                               IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU;
+                               IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |
+                               IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |
+                               IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |
+                               IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |
+                               IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
+                               IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;
                        break;
-#ifdef CONFIG_MAC80211_MESH
-               case NL80211_IFTYPE_MESH_POINT:
-                       break;
-#endif
                }
 
                he_mcs->rx_mcs_80 = cpu_to_le16(mcs_map);