Commit 75c5bd68 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

ieee80211: change HE nominal packet padding value defines 



It's easier to use and understand, and to extend for EHT later,
if we use the values here instead of the shifted values.

Unfortunately, we need to add _POS so that we can use it in
places like iwlwifi/mvm where constants are needed.

While at it, fix the typo ("NOMIMAL") which also helps catch any
conflicts.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://lore.kernel.org/r/20211126104817.7c29a05b8eb5.I2ca9faf06e177e3035bec91e2ae53c2f91d41774@changeid


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

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

+4 −2
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
				.phy_cap_info[9] =

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

					(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED <<

					IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS),

				.phy_cap_info[10] =

					IEEE80211_HE_PHY_CAP10_HE_MU_M1RU_MAX_LTF,

			},
@@ -664,7 +665,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |

					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_242,

				.phy_cap_info[9] =

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

					IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED

					<< IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_POS,

			},

			/*

			 * Set default Tx/Rx HE MCS NSS Support field.

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+8 −8
Original line number Diff line number Diff line
@@ -2126,24 +2126,24 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, 
		}



		flags |= STA_CTXT_HE_PACKET_EXT;

	} else if ((sta->he_cap.he_cap_elem.phy_cap_info[9] &

		    IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) !=

		  IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) {

	} else if (u8_get_bits(sta->he_cap.he_cap_elem.phy_cap_info[9],

			       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)

		   != IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_RESERVED) {

		int low_th = -1;

		int high_th = -1;



		/* Take the PPE thresholds from the nominal padding info */

		switch (sta->he_cap.he_cap_elem.phy_cap_info[9] &

			IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:

		switch (u8_get_bits(sta->he_cap.he_cap_elem.phy_cap_info[9],

				    IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK)) {

		case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_0US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:

		case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_8US:

			low_th = IWL_HE_PKT_EXT_BPSK;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:

		case IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_BPSK;

			break;

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

+2 −1
Original line number Diff line number Diff line
@@ -853,7 +853,8 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, 
			mt7915_gen_ppe_thresh(he_cap->ppe_thres, nss);

		} else {

			he_cap_elem->phy_cap_info[9] |=

				IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;

				u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,

					       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);

		}

		idx++;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band, 
			mt7921_gen_ppe_thresh(he_cap->ppe_thres, nss);

		} else {

			he_cap_elem->phy_cap_info[9] |=

				IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;

				u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,

					       IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);

		}



		if (band == NL80211_BAND_6GHZ) {

drivers/net/wireless/realtek/rtw89/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2115,7 +2115,8 @@ static void rtw89_init_he_cap(struct rtw89_dev *rtwdev, 
				  IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |

				  IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |

				  IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

				  IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US;

				  u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US,

						 IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK);

		if (i == NL80211_IFTYPE_STATION)

			phy_cap_info[9] |= IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU;

		he_cap->he_mcs_nss_supp.rx_mcs_80 = cpu_to_le16(mcs_map);