Commit 76cf4221 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210409123755.b1e5fbab0d8c.I3eb6076cb0714ec6aec6b8f9dee613ce4a05d825@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7dd231eb

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

+5 −5
Original line number Diff line number Diff line
@@ -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;

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

+3 −3
Original line number Diff line number Diff line
@@ -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] =

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

+5 −5
Original line number Diff line number Diff line
@@ -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 |

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

+2 −2
Original line number Diff line number Diff line
@@ -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]);

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

+1 −1
Original line number Diff line number Diff line
@@ -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 |