wireless: align some HE capabilities with the spec

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Johannes Berg 5 years ago 76cf4221 7dd231eb

+33 -32

7 changed files

expand all

drivers

net

wireless

ath

ath11k

mac.c

intel

iwlwifi

iwl-nvm-parse.c

mediatek

mt76

mt7915

init.c

mcu.c

mt7921

main.c

include

linux

ieee80211.h

net

mac80211

debugfs_sta.c

+5 -5

drivers/net/wireless/ath/ath11k/mac.c

··· 3807 3807 IEEE80211_HE_MAC_CAP4_BQR; 3808 3808 he_cap_elem->mac_cap_info[4] &= ~m; 3809 3809 3810 - m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION | 3810 + m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION | 3811 3811 IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU | 3812 3812 IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING | 3813 3813 IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX; ··· 3817 3817 IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO; 3818 3818 he_cap_elem->phy_cap_info[2] &= ~m; 3819 3819 3820 - m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA | 3820 + m = IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU | 3821 3821 IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK | 3822 3822 IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK; 3823 3823 he_cap_elem->phy_cap_info[3] &= ~m; ··· 3829 3829 he_cap_elem->phy_cap_info[5] &= ~m; 3830 3830 3831 3831 m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU | 3832 - IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB | 3832 + IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB | 3833 3833 IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB | 3834 3834 IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO; 3835 3835 he_cap_elem->phy_cap_info[6] &= ~m; 3836 3836 3837 - m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR | 3838 - IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR | 3837 + m = IEEE80211_HE_PHY_CAP7_PSR_BASED_SR | 3838 + IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | 3839 3839 IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ | 3840 3840 IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ; 3841 3841 he_cap_elem->phy_cap_info[7] &= ~m;

+3 -3

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

··· 583 583 IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 | 584 584 IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2, 585 585 .phy_cap_info[6] = 586 - IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB | 587 - IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB | 586 + IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | 587 + IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB | 588 588 IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT, 589 589 .phy_cap_info[7] = 590 - IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR | 590 + IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | 591 591 IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI | 592 592 IEEE80211_HE_PHY_CAP7_MAX_NC_1, 593 593 .phy_cap_info[8] =

+5 -5

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

··· 370 370 IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK; 371 371 elem->phy_cap_info[5] &= ~c; 372 372 373 - c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB | 374 - IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB; 373 + c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | 374 + IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB; 375 375 elem->phy_cap_info[6] &= ~c; 376 376 377 377 elem->phy_cap_info[7] &= ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK; ··· 408 408 c = (nss - 1) | (max_t(int, le16_to_cpu(mcs->tx_mcs_160), 1) << 3); 409 409 elem->phy_cap_info[5] |= c; 410 410 411 - c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB | 412 - IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB; 411 + c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | 412 + IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB; 413 413 elem->phy_cap_info[6] |= c; 414 414 415 415 /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */ ··· 535 535 IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | 536 536 IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT; 537 537 he_cap_elem->phy_cap_info[7] |= 538 - IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR | 538 + IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | 539 539 IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI; 540 540 he_cap_elem->phy_cap_info[8] |= 541 541 IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |

+2 -2

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

··· 1821 1821 1822 1822 bf->tx_mode = MT_PHY_TYPE_HE_SU; 1823 1823 mt7915_mcu_sta_sounding_rate(bf); 1824 - bf->trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMER_FB, 1824 + bf->trigger_su = HE_PHY(CAP6_TRIG_SU_BEAMFORMING_FB, 1825 1825 pe->phy_cap_info[6]); 1826 - bf->trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMER_FB, 1826 + bf->trigger_mu = HE_PHY(CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB, 1827 1827 pe->phy_cap_info[6]); 1828 1828 bfer_nr = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK, 1829 1829 ve->phy_cap_info[5]);

+1 -1

drivers/net/wireless/mediatek/mt76/mt7921/main.c

··· 108 108 IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | 109 109 IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT; 110 110 he_cap_elem->phy_cap_info[7] |= 111 - IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR | 111 + IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP | 112 112 IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI; 113 113 he_cap_elem->phy_cap_info[8] |= 114 114 IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |

+7 -7

include/linux/ieee80211.h

··· 2020 2020 #define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG 0x01 2021 2021 #define IEEE80211_HE_MAC_CAP4_QTP 0x02 2022 2022 #define IEEE80211_HE_MAC_CAP4_BQR 0x04 2023 - #define IEEE80211_HE_MAC_CAP4_SRP_RESP 0x08 2023 + #define IEEE80211_HE_MAC_CAP4_PSR_RESP 0x08 2024 2024 #define IEEE80211_HE_MAC_CAP4_NDP_FB_REP 0x10 2025 2025 #define IEEE80211_HE_MAC_CAP4_OPS 0x20 2026 2026 #define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU 0x40 ··· 2031 2031 2032 2032 #define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 0x01 2033 2033 #define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41 0x02 2034 - #define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION 0x04 2034 + #define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION 0x04 2035 2035 #define IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU 0x08 2036 2036 #define IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX 0x10 2037 2037 #define IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS 0x20 ··· 2089 2089 #define IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK 0x18 2090 2090 #define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1 0x00 2091 2091 #define IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_2 0x20 2092 - #define IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA 0x40 2092 + #define IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU 0x40 2093 2093 #define IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER 0x80 2094 2094 2095 2095 #define IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE 0x01 ··· 2136 2136 2137 2137 #define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU 0x01 2138 2138 #define IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU 0x02 2139 - #define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB 0x04 2140 - #define IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB 0x08 2139 + #define IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB 0x04 2140 + #define IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB 0x08 2141 2141 #define IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB 0x10 2142 2142 #define IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE 0x20 2143 2143 #define IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO 0x40 2144 2144 #define IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT 0x80 2145 2145 2146 - #define IEEE80211_HE_PHY_CAP7_SRP_BASED_SR 0x01 2147 - #define IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR 0x02 2146 + #define IEEE80211_HE_PHY_CAP7_PSR_BASED_SR 0x01 2147 + #define IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP 0x02 2148 2148 #define IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI 0x04 2149 2149 #define IEEE80211_HE_PHY_CAP7_MAX_NC_1 0x08 2150 2150 #define IEEE80211_HE_PHY_CAP7_MAX_NC_2 0x10

+10 -9

net/mac80211/debugfs_sta.c

··· 732 732 PFLAG(MAC, 4, BSRP_BQRP_A_MPDU_AGG, "BSRP-BQRP-A-MPDU-AGG"); 733 733 PFLAG(MAC, 4, QTP, "QTP"); 734 734 PFLAG(MAC, 4, BQR, "BQR"); 735 - PFLAG(MAC, 4, SRP_RESP, "SRP-RESP"); 735 + PFLAG(MAC, 4, PSR_RESP, "PSR-RESP"); 736 736 PFLAG(MAC, 4, NDP_FB_REP, "NDP-FB-REP"); 737 737 PFLAG(MAC, 4, OPS, "OPS"); 738 738 PFLAG(MAC, 4, AMDSU_IN_AMPDU, "AMSDU-IN-AMPDU"); 739 739 740 740 PRINT("MULTI-TID-AGG-TX-QOS-%d", ((cap[5] << 1) | (cap[4] >> 7)) & 0x7); 741 741 742 - PFLAG(MAC, 5, SUBCHAN_SELECVITE_TRANSMISSION, 743 - "SUBCHAN-SELECVITE-TRANSMISSION"); 742 + PFLAG(MAC, 5, SUBCHAN_SELECTIVE_TRANSMISSION, 743 + "SUBCHAN-SELECTIVE-TRANSMISSION"); 744 744 PFLAG(MAC, 5, UL_2x996_TONE_RU, "UL-2x996-TONE-RU"); 745 745 PFLAG(MAC, 5, OM_CTRL_UL_MU_DATA_DIS_RX, "OM-CTRL-UL-MU-DATA-DIS-RX"); 746 746 PFLAG(MAC, 5, HE_DYNAMIC_SM_PS, "HE-DYNAMIC-SM-PS"); ··· 832 832 833 833 PFLAG(PHY, 3, DCM_MAX_RX_NSS_1, "DCM-MAX-RX-NSS-1"); 834 834 PFLAG(PHY, 3, DCM_MAX_RX_NSS_2, "DCM-MAX-RX-NSS-2"); 835 - PFLAG(PHY, 3, RX_HE_MU_PPDU_FROM_NON_AP_STA, 836 - "RX-HE-MU-PPDU-FROM-NON-AP-STA"); 835 + PFLAG(PHY, 3, RX_PARTIAL_BW_SU_IN_20MHZ_MU, 836 + "RX-PARTIAL-BW-SU-IN-20MHZ-MU"); 837 837 PFLAG(PHY, 3, SU_BEAMFORMER, "SU-BEAMFORMER"); 838 838 839 839 PFLAG(PHY, 4, SU_BEAMFORMEE, "SU-BEAMFORMEE"); ··· 853 853 854 854 PFLAG(PHY, 6, CODEBOOK_SIZE_42_SU, "CODEBOOK-SIZE-42-SU"); 855 855 PFLAG(PHY, 6, CODEBOOK_SIZE_75_MU, "CODEBOOK-SIZE-75-MU"); 856 - PFLAG(PHY, 6, TRIG_SU_BEAMFORMER_FB, "TRIG-SU-BEAMFORMER-FB"); 857 - PFLAG(PHY, 6, TRIG_MU_BEAMFORMER_FB, "TRIG-MU-BEAMFORMER-FB"); 856 + PFLAG(PHY, 6, TRIG_SU_BEAMFORMING_FB, "TRIG-SU-BEAMFORMING-FB"); 857 + PFLAG(PHY, 6, TRIG_MU_BEAMFORMING_PARTIAL_BW_FB, 858 + "MU-BEAMFORMING-PARTIAL-BW-FB"); 858 859 PFLAG(PHY, 6, TRIG_CQI_FB, "TRIG-CQI-FB"); 859 860 PFLAG(PHY, 6, PARTIAL_BW_EXT_RANGE, "PARTIAL-BW-EXT-RANGE"); 860 861 PFLAG(PHY, 6, PARTIAL_BANDWIDTH_DL_MUMIMO, 861 862 "PARTIAL-BANDWIDTH-DL-MUMIMO"); 862 863 PFLAG(PHY, 6, PPE_THRESHOLD_PRESENT, "PPE-THRESHOLD-PRESENT"); 863 864 864 - PFLAG(PHY, 7, SRP_BASED_SR, "SRP-BASED-SR"); 865 - PFLAG(PHY, 7, POWER_BOOST_FACTOR_AR, "POWER-BOOST-FACTOR-AR"); 865 + PFLAG(PHY, 7, PSR_BASED_SR, "PSR-BASED-SR"); 866 + PFLAG(PHY, 7, POWER_BOOST_FACTOR_SUPP, "POWER-BOOST-FACTOR-SUPP"); 866 867 PFLAG(PHY, 7, HE_SU_MU_PPDU_4XLTF_AND_08_US_GI, 867 868 "HE-SU-MU-PPDU-4XLTF-AND-08-US-GI"); 868 869 PFLAG_RANGE(PHY, 7, MAX_NC, 0, 1, 1, "MAX-NC-%d");