wireless: align some HE capabilities with the spec

Some names were changed, align that with the spec as of
802.11ax-D6.1.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210409123755.b1e5fbab0d8c.I3eb6076cb0714ec6aec6b8f9dee613ce4a05d825@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index faa2e678e63eff9b1c605ad0c32a30127b2b171e..343768afedc4aa69bd7654ece830eaffe321bd44 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3807,7 +3807,7 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem)
            IEEE80211_HE_MAC_CAP4_BQR;
        he_cap_elem->mac_cap_info[4] &= ~m;
 
-       m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION |
+       m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION |
            IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |
            IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING |
            IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;
@@ -3817,7 +3817,7 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem)
            IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;
        he_cap_elem->phy_cap_info[2] &= ~m;
 
-       m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA |
+       m = IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU |
            IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK |
            IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK;
        he_cap_elem->phy_cap_info[3] &= ~m;
@@ -3829,13 +3829,13 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem)
        he_cap_elem->phy_cap_info[5] &= ~m;
 
        m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |
-           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
+           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |
            IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |
            IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO;
        he_cap_elem->phy_cap_info[6] &= ~m;
 
-       m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR |
-           IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
+       m = IEEE80211_HE_PHY_CAP7_PSR_BASED_SR |
+           IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |
            IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ |
            IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;
        he_cap_elem->phy_cap_info[7] &= ~m;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index af684f80b0cc57f6350a64fb16f3b5f1b6b5a5a1..632f20d4027d43c22076c5a0415cf1e0d9e20832 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -583,11 +583,11 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {
                                        IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |
                                        IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,
                                .phy_cap_info[6] =
-                                       IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
-                                       IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
+                                       IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
+                                       IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |
                                        IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,
                                .phy_cap_info[7] =
-                                       IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
+                                       IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |
                                        IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |
                                        IEEE80211_HE_PHY_CAP7_MAX_NC_1,
                                .phy_cap_info[8] =

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index ad4e5b95158bc4cf59abf00e9cef765259bde303..d9a0587f234b919abc43bd90a37ae389a2a810f2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -370,8 +370,8 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,
            IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK;
        elem->phy_cap_info[5] &= ~c;
 
-       c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
-           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB;
+       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;
 
        elem->phy_cap_info[7] &= ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;
@@ -408,8 +408,8 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap,
        c = (nss - 1) | (max_t(int, le16_to_cpu(mcs->tx_mcs_160), 1) << 3);
        elem->phy_cap_info[5] |= c;
 
-       c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
-           IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB;
+       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;
 
        /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */
@@ -535,7 +535,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
                                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_POWER_BOOST_FACTOR_SUPP |
                                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 |

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 195929242b72f94119ee98bd8c1ee146e63df4e4..97ef0265c51618cf4dbdea7490fdb254e4e5a65f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1821,9 +1821,9 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
 
        bf->tx_mode = MT_PHY_TYPE_HE_SU;
        mt7915_mcu_sta_sounding_rate(bf);
-       bf->trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMER_FB,
+       bf->trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMING_FB,
                                pe->phy_cap_info[6]);
-       bf->trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMER_FB,
+       bf->trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB,
                                pe->phy_cap_info[6]);
        bfer_nr = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,
                         ve->phy_cap_info[5]);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 729f6c42cddee7c5a6452ee0062bb07f1077b7c6..fdd93926b5162707f26bee6f4e07d9d6667fc05a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -108,7 +108,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band,
                                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_POWER_BOOST_FACTOR_SUPP |
                                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 |

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 25fc7bee868aa36330e1e09c411c1fb1e45eebeb..687db25eb85f698165a05853772c194195986e3b 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2020,7 +2020,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
 #define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG             0x01
 #define IEEE80211_HE_MAC_CAP4_QTP                              0x02
 #define IEEE80211_HE_MAC_CAP4_BQR                              0x04
-#define IEEE80211_HE_MAC_CAP4_SRP_RESP                         0x08
+#define IEEE80211_HE_MAC_CAP4_PSR_RESP                         0x08
 #define IEEE80211_HE_MAC_CAP4_NDP_FB_REP                       0x10
 #define IEEE80211_HE_MAC_CAP4_OPS                              0x20
 #define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU                   0x40
@@ -2031,7 +2031,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
 
 #define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40         0x01
 #define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41         0x02
-#define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION   0x04
+#define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION   0x04
 #define IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU                 0x08
 #define IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX                0x10
 #define IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS                 0x20
@@ -2089,7 +2089,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
 #define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK                    0x18
 #define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1                         0x00
 #define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_2                         0x20
-#define IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA            0x40
+#define IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU             0x40
 #define IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER                            0x80
 
 #define IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE                            0x01
@@ -2136,15 +2136,15 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
 
 #define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU                      0x01
 #define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU                      0x02
-#define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB                    0x04
-#define IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB                    0x08
+#define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB                   0x04
+#define IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB                0x08
 #define IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB                              0x10
 #define IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE                     0x20
 #define IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO              0x40
 #define IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT                    0x80
 
-#define IEEE80211_HE_PHY_CAP7_SRP_BASED_SR                             0x01
-#define IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR                    0x02
+#define IEEE80211_HE_PHY_CAP7_PSR_BASED_SR                             0x01
+#define IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP                  0x02
 #define IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI         0x04
 #define IEEE80211_HE_PHY_CAP7_MAX_NC_1                                 0x08
 #define IEEE80211_HE_PHY_CAP7_MAX_NC_2                                 0x10

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 5a27c61a7b3887979a8aaf9cd84bbe012deea56d..d350224d45e8503231d055acb42933e10de232ee 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -732,15 +732,15 @@ static ssize_t sta_he_capa_read(struct file *file, char __user *userbuf,
        PFLAG(MAC, 4, BSRP_BQRP_A_MPDU_AGG, "BSRP-BQRP-A-MPDU-AGG");
        PFLAG(MAC, 4, QTP, "QTP");
        PFLAG(MAC, 4, BQR, "BQR");
-       PFLAG(MAC, 4, SRP_RESP, "SRP-RESP");
+       PFLAG(MAC, 4, PSR_RESP, "PSR-RESP");
        PFLAG(MAC, 4, NDP_FB_REP, "NDP-FB-REP");
        PFLAG(MAC, 4, OPS, "OPS");
        PFLAG(MAC, 4, AMDSU_IN_AMPDU, "AMSDU-IN-AMPDU");
 
        PRINT("MULTI-TID-AGG-TX-QOS-%d", ((cap[5] << 1) | (cap[4] >> 7)) & 0x7);
 
-       PFLAG(MAC, 5, SUBCHAN_SELECVITE_TRANSMISSION,
-             "SUBCHAN-SELECVITE-TRANSMISSION");
+       PFLAG(MAC, 5, SUBCHAN_SELECTIVE_TRANSMISSION,
+             "SUBCHAN-SELECTIVE-TRANSMISSION");
        PFLAG(MAC, 5, UL_2x996_TONE_RU, "UL-2x996-TONE-RU");
        PFLAG(MAC, 5, OM_CTRL_UL_MU_DATA_DIS_RX, "OM-CTRL-UL-MU-DATA-DIS-RX");
        PFLAG(MAC, 5, HE_DYNAMIC_SM_PS, "HE-DYNAMIC-SM-PS");
@@ -832,8 +832,8 @@ static ssize_t sta_he_capa_read(struct file *file, char __user *userbuf,
 
        PFLAG(PHY, 3, DCM_MAX_RX_NSS_1, "DCM-MAX-RX-NSS-1");
        PFLAG(PHY, 3, DCM_MAX_RX_NSS_2, "DCM-MAX-RX-NSS-2");
-       PFLAG(PHY, 3, RX_HE_MU_PPDU_FROM_NON_AP_STA,
-             "RX-HE-MU-PPDU-FROM-NON-AP-STA");
+       PFLAG(PHY, 3, RX_PARTIAL_BW_SU_IN_20MHZ_MU,
+             "RX-PARTIAL-BW-SU-IN-20MHZ-MU");
        PFLAG(PHY, 3, SU_BEAMFORMER, "SU-BEAMFORMER");
 
        PFLAG(PHY, 4, SU_BEAMFORMEE, "SU-BEAMFORMEE");
@@ -853,16 +853,17 @@ static ssize_t sta_he_capa_read(struct file *file, char __user *userbuf,
 
        PFLAG(PHY, 6, CODEBOOK_SIZE_42_SU, "CODEBOOK-SIZE-42-SU");
        PFLAG(PHY, 6, CODEBOOK_SIZE_75_MU, "CODEBOOK-SIZE-75-MU");
-       PFLAG(PHY, 6, TRIG_SU_BEAMFORMER_FB, "TRIG-SU-BEAMFORMER-FB");
-       PFLAG(PHY, 6, TRIG_MU_BEAMFORMER_FB, "TRIG-MU-BEAMFORMER-FB");
+       PFLAG(PHY, 6, TRIG_SU_BEAMFORMING_FB, "TRIG-SU-BEAMFORMING-FB");
+       PFLAG(PHY, 6, TRIG_MU_BEAMFORMING_PARTIAL_BW_FB,
+             "MU-BEAMFORMING-PARTIAL-BW-FB");
        PFLAG(PHY, 6, TRIG_CQI_FB, "TRIG-CQI-FB");
        PFLAG(PHY, 6, PARTIAL_BW_EXT_RANGE, "PARTIAL-BW-EXT-RANGE");
        PFLAG(PHY, 6, PARTIAL_BANDWIDTH_DL_MUMIMO,
              "PARTIAL-BANDWIDTH-DL-MUMIMO");
        PFLAG(PHY, 6, PPE_THRESHOLD_PRESENT, "PPE-THRESHOLD-PRESENT");
 
-       PFLAG(PHY, 7, SRP_BASED_SR, "SRP-BASED-SR");
-       PFLAG(PHY, 7, POWER_BOOST_FACTOR_AR, "POWER-BOOST-FACTOR-AR");
+       PFLAG(PHY, 7, PSR_BASED_SR, "PSR-BASED-SR");
+       PFLAG(PHY, 7, POWER_BOOST_FACTOR_SUPP, "POWER-BOOST-FACTOR-SUPP");
        PFLAG(PHY, 7, HE_SU_MU_PPDU_4XLTF_AND_08_US_GI,
              "HE-SU-MU-PPDU-4XLTF-AND-08-US-GI");
        PFLAG_RANGE(PHY, 7, MAX_NC, 0, 1, 1, "MAX-NC-%d");