diff mbox series

[04/15] wireless: align some HE capabilities with the spec

Message ID iwlwifi.20210409123755.b1e5fbab0d8c.I3eb6076cb0714ec6aec6b8f9dee613ce4a05d825@changeid (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series cfg80211/mac80211 patches from our internal tree 2021-04-09 | expand

Commit Message

Luca Coelho April 9, 2021, 9:40 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

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

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 .../wireless/intel/iwlwifi/iwl-nvm-parse.c    |  6 +++---
 include/linux/ieee80211.h                     | 14 +++++++-------
 net/mac80211/debugfs_sta.c                    | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

Comments

kernel test robot April 9, 2021, 12:24 p.m. UTC | #1 
Hi Luca,

I love your patch! Yet something to improve:

[auto build test ERROR on mac80211-next/master]
[also build test ERROR on mac80211/master wireless-drivers-next/master wireless-drivers/master v5.12-rc6 next-20210408]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Luca-Coelho/cfg80211-mac80211-patches-from-our-internal-tree-2021-04-09/20210409-181210
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git master
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/13582e33bee8630eb3f2d4299b14e989bc06d297
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Luca-Coelho/cfg80211-mac80211-patches-from-our-internal-tree-2021-04-09/20210409-181210
        git checkout 13582e33bee8630eb3f2d4299b14e989bc06d297
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/net/wireless/ath/ath11k/mac.c: In function 'ath11k_mac_filter_he_cap_mesh':
>> drivers/net/wireless/ath/ath11k/mac.c:3810:6: error: 'IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION' undeclared (first use in this function); did you mean 'IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION'?
    3810 |  m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION |
         |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |      IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION
   drivers/net/wireless/ath/ath11k/mac.c:3810:6: note: each undeclared identifier is reported only once for each function it appears in
>> drivers/net/wireless/ath/ath11k/mac.c:3820:6: error: 'IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA' undeclared (first use in this function)
    3820 |  m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA |
         |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/net/wireless/ath/ath11k/mac.c:3832:6: error: 'IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB' undeclared (first use in this function); did you mean 'IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB'?
    3832 |      IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
         |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |      IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB
>> drivers/net/wireless/ath/ath11k/mac.c:3837:6: error: 'IEEE80211_HE_PHY_CAP7_SRP_BASED_SR' undeclared (first use in this function); did you mean 'IEEE80211_HE_PHY_CAP7_PSR_BASED_SR'?
    3837 |  m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR |
         |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |      IEEE80211_HE_PHY_CAP7_PSR_BASED_SR
>> drivers/net/wireless/ath/ath11k/mac.c:3838:6: error: 'IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR' undeclared (first use in this function); did you mean 'IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP'?
    3838 |      IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
         |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         |      IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP


vim +3810 drivers/net/wireless/ath/ath11k/mac.c

9f056ed8ee01ad John Crispin   2019-11-25  3786  
13591a1c3899cf Sven Eckelmann 2019-12-10  3787  static void
13591a1c3899cf Sven Eckelmann 2019-12-10  3788  ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem)
13591a1c3899cf Sven Eckelmann 2019-12-10  3789  {
13591a1c3899cf Sven Eckelmann 2019-12-10  3790  	u8 m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3791  
13591a1c3899cf Sven Eckelmann 2019-12-10  3792  	m = IEEE80211_HE_MAC_CAP0_TWT_RES |
13591a1c3899cf Sven Eckelmann 2019-12-10  3793  	    IEEE80211_HE_MAC_CAP0_TWT_REQ;
13591a1c3899cf Sven Eckelmann 2019-12-10  3794  	he_cap_elem->mac_cap_info[0] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3795  
13591a1c3899cf Sven Eckelmann 2019-12-10  3796  	m = IEEE80211_HE_MAC_CAP2_TRS |
13591a1c3899cf Sven Eckelmann 2019-12-10  3797  	    IEEE80211_HE_MAC_CAP2_BCAST_TWT |
13591a1c3899cf Sven Eckelmann 2019-12-10  3798  	    IEEE80211_HE_MAC_CAP2_MU_CASCADING;
13591a1c3899cf Sven Eckelmann 2019-12-10  3799  	he_cap_elem->mac_cap_info[2] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3800  
13591a1c3899cf Sven Eckelmann 2019-12-10  3801  	m = IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED |
13591a1c3899cf Sven Eckelmann 2019-12-10  3802  	    IEEE80211_HE_MAC_CAP2_BCAST_TWT |
13591a1c3899cf Sven Eckelmann 2019-12-10  3803  	    IEEE80211_HE_MAC_CAP2_MU_CASCADING;
13591a1c3899cf Sven Eckelmann 2019-12-10  3804  	he_cap_elem->mac_cap_info[3] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3805  
13591a1c3899cf Sven Eckelmann 2019-12-10  3806  	m = IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG |
13591a1c3899cf Sven Eckelmann 2019-12-10  3807  	    IEEE80211_HE_MAC_CAP4_BQR;
13591a1c3899cf Sven Eckelmann 2019-12-10  3808  	he_cap_elem->mac_cap_info[4] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3809  
13591a1c3899cf Sven Eckelmann 2019-12-10 @3810  	m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION |
13591a1c3899cf Sven Eckelmann 2019-12-10  3811  	    IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3812  	    IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING |
13591a1c3899cf Sven Eckelmann 2019-12-10  3813  	    IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;
13591a1c3899cf Sven Eckelmann 2019-12-10  3814  	he_cap_elem->mac_cap_info[5] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3815  
13591a1c3899cf Sven Eckelmann 2019-12-10  3816  	m = IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |
13591a1c3899cf Sven Eckelmann 2019-12-10  3817  	    IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;
13591a1c3899cf Sven Eckelmann 2019-12-10  3818  	he_cap_elem->phy_cap_info[2] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3819  
13591a1c3899cf Sven Eckelmann 2019-12-10 @3820  	m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA |
13591a1c3899cf Sven Eckelmann 2019-12-10  3821  	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK |
13591a1c3899cf Sven Eckelmann 2019-12-10  3822  	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK;
13591a1c3899cf Sven Eckelmann 2019-12-10  3823  	he_cap_elem->phy_cap_info[3] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3824  
13591a1c3899cf Sven Eckelmann 2019-12-10  3825  	m = IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;
13591a1c3899cf Sven Eckelmann 2019-12-10  3826  	he_cap_elem->phy_cap_info[4] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3827  
13591a1c3899cf Sven Eckelmann 2019-12-10  3828  	m = IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK;
13591a1c3899cf Sven Eckelmann 2019-12-10  3829  	he_cap_elem->phy_cap_info[5] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3830  
13591a1c3899cf Sven Eckelmann 2019-12-10  3831  	m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |
13591a1c3899cf Sven Eckelmann 2019-12-10 @3832  	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
13591a1c3899cf Sven Eckelmann 2019-12-10  3833  	    IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |
13591a1c3899cf Sven Eckelmann 2019-12-10  3834  	    IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO;
13591a1c3899cf Sven Eckelmann 2019-12-10  3835  	he_cap_elem->phy_cap_info[6] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3836  
13591a1c3899cf Sven Eckelmann 2019-12-10 @3837  	m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR |
13591a1c3899cf Sven Eckelmann 2019-12-10 @3838  	    IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
13591a1c3899cf Sven Eckelmann 2019-12-10  3839  	    IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ |
13591a1c3899cf Sven Eckelmann 2019-12-10  3840  	    IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;
13591a1c3899cf Sven Eckelmann 2019-12-10  3841  	he_cap_elem->phy_cap_info[7] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3842  
13591a1c3899cf Sven Eckelmann 2019-12-10  3843  	m = IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |
13591a1c3899cf Sven Eckelmann 2019-12-10  3844  	    IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
13591a1c3899cf Sven Eckelmann 2019-12-10  3845  	    IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3846  	    IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;
13591a1c3899cf Sven Eckelmann 2019-12-10  3847  	he_cap_elem->phy_cap_info[8] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3848  
13591a1c3899cf Sven Eckelmann 2019-12-10  3849  	m = IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |
13591a1c3899cf Sven Eckelmann 2019-12-10  3850  	    IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |
13591a1c3899cf Sven Eckelmann 2019-12-10  3851  	    IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3852  	    IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3853  	    IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
13591a1c3899cf Sven Eckelmann 2019-12-10  3854  	    IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;
13591a1c3899cf Sven Eckelmann 2019-12-10  3855  	he_cap_elem->phy_cap_info[9] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3856  }
13591a1c3899cf Sven Eckelmann 2019-12-10  3857  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot April 9, 2021, 11:31 p.m. UTC | #2 
Hi Luca,

I love your patch! Yet something to improve:

[auto build test ERROR on mac80211-next/master]
[also build test ERROR on mac80211/master wireless-drivers-next/master wireless-drivers/master v5.12-rc6 next-20210409]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Luca-Coelho/cfg80211-mac80211-patches-from-our-internal-tree-2021-04-09/20210409-181210
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git master
config: x86_64-randconfig-a006-20210409 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project dd453a1389b6a7e6d9214b449d3c54981b1a89b6)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install x86_64 cross compiling tool for clang build
        # apt-get install binutils-x86-64-linux-gnu
        # https://github.com/0day-ci/linux/commit/13582e33bee8630eb3f2d4299b14e989bc06d297
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Luca-Coelho/cfg80211-mac80211-patches-from-our-internal-tree-2021-04-09/20210409-181210
        git checkout 13582e33bee8630eb3f2d4299b14e989bc06d297
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/net/wireless/ath/ath11k/mac.c:3810:6: error: use of undeclared identifier 'IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION'
           m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION |
               ^
>> drivers/net/wireless/ath/ath11k/mac.c:3820:6: error: use of undeclared identifier 'IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA'
           m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA |
               ^
>> drivers/net/wireless/ath/ath11k/mac.c:3832:6: error: use of undeclared identifier 'IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB'
               IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
               ^
>> drivers/net/wireless/ath/ath11k/mac.c:3837:6: error: use of undeclared identifier 'IEEE80211_HE_PHY_CAP7_SRP_BASED_SR'
           m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR |
               ^
>> drivers/net/wireless/ath/ath11k/mac.c:3838:6: error: use of undeclared identifier 'IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR'
               IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
               ^
   5 errors generated.


vim +/IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION +3810 drivers/net/wireless/ath/ath11k/mac.c

9f056ed8ee01ad John Crispin   2019-11-25  3786  
13591a1c3899cf Sven Eckelmann 2019-12-10  3787  static void
13591a1c3899cf Sven Eckelmann 2019-12-10  3788  ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem)
13591a1c3899cf Sven Eckelmann 2019-12-10  3789  {
13591a1c3899cf Sven Eckelmann 2019-12-10  3790  	u8 m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3791  
13591a1c3899cf Sven Eckelmann 2019-12-10  3792  	m = IEEE80211_HE_MAC_CAP0_TWT_RES |
13591a1c3899cf Sven Eckelmann 2019-12-10  3793  	    IEEE80211_HE_MAC_CAP0_TWT_REQ;
13591a1c3899cf Sven Eckelmann 2019-12-10  3794  	he_cap_elem->mac_cap_info[0] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3795  
13591a1c3899cf Sven Eckelmann 2019-12-10  3796  	m = IEEE80211_HE_MAC_CAP2_TRS |
13591a1c3899cf Sven Eckelmann 2019-12-10  3797  	    IEEE80211_HE_MAC_CAP2_BCAST_TWT |
13591a1c3899cf Sven Eckelmann 2019-12-10  3798  	    IEEE80211_HE_MAC_CAP2_MU_CASCADING;
13591a1c3899cf Sven Eckelmann 2019-12-10  3799  	he_cap_elem->mac_cap_info[2] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3800  
13591a1c3899cf Sven Eckelmann 2019-12-10  3801  	m = IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED |
13591a1c3899cf Sven Eckelmann 2019-12-10  3802  	    IEEE80211_HE_MAC_CAP2_BCAST_TWT |
13591a1c3899cf Sven Eckelmann 2019-12-10  3803  	    IEEE80211_HE_MAC_CAP2_MU_CASCADING;
13591a1c3899cf Sven Eckelmann 2019-12-10  3804  	he_cap_elem->mac_cap_info[3] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3805  
13591a1c3899cf Sven Eckelmann 2019-12-10  3806  	m = IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG |
13591a1c3899cf Sven Eckelmann 2019-12-10  3807  	    IEEE80211_HE_MAC_CAP4_BQR;
13591a1c3899cf Sven Eckelmann 2019-12-10  3808  	he_cap_elem->mac_cap_info[4] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3809  
13591a1c3899cf Sven Eckelmann 2019-12-10 @3810  	m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION |
13591a1c3899cf Sven Eckelmann 2019-12-10  3811  	    IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3812  	    IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING |
13591a1c3899cf Sven Eckelmann 2019-12-10  3813  	    IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;
13591a1c3899cf Sven Eckelmann 2019-12-10  3814  	he_cap_elem->mac_cap_info[5] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3815  
13591a1c3899cf Sven Eckelmann 2019-12-10  3816  	m = IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |
13591a1c3899cf Sven Eckelmann 2019-12-10  3817  	    IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;
13591a1c3899cf Sven Eckelmann 2019-12-10  3818  	he_cap_elem->phy_cap_info[2] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3819  
13591a1c3899cf Sven Eckelmann 2019-12-10 @3820  	m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA |
13591a1c3899cf Sven Eckelmann 2019-12-10  3821  	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK |
13591a1c3899cf Sven Eckelmann 2019-12-10  3822  	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK;
13591a1c3899cf Sven Eckelmann 2019-12-10  3823  	he_cap_elem->phy_cap_info[3] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3824  
13591a1c3899cf Sven Eckelmann 2019-12-10  3825  	m = IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER;
13591a1c3899cf Sven Eckelmann 2019-12-10  3826  	he_cap_elem->phy_cap_info[4] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3827  
13591a1c3899cf Sven Eckelmann 2019-12-10  3828  	m = IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK;
13591a1c3899cf Sven Eckelmann 2019-12-10  3829  	he_cap_elem->phy_cap_info[5] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3830  
13591a1c3899cf Sven Eckelmann 2019-12-10  3831  	m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |
13591a1c3899cf Sven Eckelmann 2019-12-10 @3832  	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
13591a1c3899cf Sven Eckelmann 2019-12-10  3833  	    IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |
13591a1c3899cf Sven Eckelmann 2019-12-10  3834  	    IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO;
13591a1c3899cf Sven Eckelmann 2019-12-10  3835  	he_cap_elem->phy_cap_info[6] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3836  
13591a1c3899cf Sven Eckelmann 2019-12-10 @3837  	m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR |
13591a1c3899cf Sven Eckelmann 2019-12-10 @3838  	    IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
13591a1c3899cf Sven Eckelmann 2019-12-10  3839  	    IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ |
13591a1c3899cf Sven Eckelmann 2019-12-10  3840  	    IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;
13591a1c3899cf Sven Eckelmann 2019-12-10  3841  	he_cap_elem->phy_cap_info[7] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3842  
13591a1c3899cf Sven Eckelmann 2019-12-10  3843  	m = IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |
13591a1c3899cf Sven Eckelmann 2019-12-10  3844  	    IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
13591a1c3899cf Sven Eckelmann 2019-12-10  3845  	    IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3846  	    IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;
13591a1c3899cf Sven Eckelmann 2019-12-10  3847  	he_cap_elem->phy_cap_info[8] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3848  
13591a1c3899cf Sven Eckelmann 2019-12-10  3849  	m = IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM |
13591a1c3899cf Sven Eckelmann 2019-12-10  3850  	    IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |
13591a1c3899cf Sven Eckelmann 2019-12-10  3851  	    IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3852  	    IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |
13591a1c3899cf Sven Eckelmann 2019-12-10  3853  	    IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
13591a1c3899cf Sven Eckelmann 2019-12-10  3854  	    IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;
13591a1c3899cf Sven Eckelmann 2019-12-10  3855  	he_cap_elem->phy_cap_info[9] &= ~m;
13591a1c3899cf Sven Eckelmann 2019-12-10  3856  }
13591a1c3899cf Sven Eckelmann 2019-12-10  3857  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index af684f80b0cc..632f20d4027d 100644
--- 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/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 72ff75fb1971..0c15fb64e7c2 100644
--- 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 5a27c61a7b38..d350224d45e8 100644
--- 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");