| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Fri, 9 Apr 2021 12:40:17 +0300 |
| Subject: [PATCH] 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> |
| --- |
| |
| --- a/drivers/net/wireless/ath/ath11k/mac.c |
| +++ b/drivers/net/wireless/ath/ath11k/mac.c |
| @@ -3648,7 +3648,7 @@ ath11k_mac_filter_he_cap_mesh(struct iee |
| 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; |
| @@ -3658,7 +3658,7 @@ ath11k_mac_filter_he_cap_mesh(struct iee |
| 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; |
| @@ -3670,13 +3670,13 @@ ath11k_mac_filter_he_cap_mesh(struct iee |
| 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; |
| --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c |
| +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c |
| @@ -307,8 +307,8 @@ mt7915_set_stream_he_txbf_caps(struct ie |
| 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; |
| @@ -348,8 +348,8 @@ mt7915_set_stream_he_txbf_caps(struct ie |
| c = (nss - 1) | (max_t(int, 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; |
| } |
| |
| @@ -484,7 +484,7 @@ mt7915_init_he_caps(struct mt7915_phy *p |
| 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 | |
| --- a/include/linux/ieee80211.h |
| +++ b/include/linux/ieee80211.h |
| @@ -2065,7 +2065,7 @@ int ieee80211_get_vht_max_nss(struct iee |
| #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 |
| @@ -2076,7 +2076,7 @@ int ieee80211_get_vht_max_nss(struct iee |
| |
| #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 |
| @@ -2134,7 +2134,7 @@ int ieee80211_get_vht_max_nss(struct iee |
| #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 |
| @@ -2181,15 +2181,15 @@ int ieee80211_get_vht_max_nss(struct iee |
| |
| #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 |
| --- a/net/mac80211/debugfs_sta.c |
| +++ b/net/mac80211/debugfs_sta.c |
| @@ -732,15 +732,15 @@ static ssize_t sta_he_capa_read(struct f |
| 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 f |
| |
| 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 f |
| |
| 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"); |
| --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c |
| @@ -630,7 +630,7 @@ static struct ieee80211_sband_iftype_dat |
| .phy_cap_info[6] = |
| 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] = |