wifi: iwlwifi: nvm-parse: advertise common packet padding

We should - at least for now - advertise common nominal packet
padding of 16µs instead of the more specific PPE thresholds.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240123200528.4312e176dfdc.Ide75980ff57257a31e86e6ac5948a8f97aaab577@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 8e6ce484db87a45bdc438e23ca8a1301ed36a584..a7152d65eefafac1be24e80ea078d09301bbba45 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -696,10 +696,11 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {
                                        IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP |
                                        IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI,
                                .phy_cap_info[5] =
+                                       FIELD_PREP_CONST(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK,
+                                                        IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US) |
                                        IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK |
                                        IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP |
-                                       IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP |
-                                       IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT,
+                                       IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP,
                                .phy_cap_info[6] =
                                        IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK |
                                        IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP,
@@ -733,6 +734,9 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {
                        /*
                         * PPE thresholds for NSS = 2, and RU index bitmap set
                         * to 0xc.
+                        * Note: just for stating what we want, not present in
+                        * the transmitted data due to not including
+                        * IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT.
                         */
                        .eht_ppe_thres = {0xc1, 0x0e, 0xe0 }
                },
@@ -801,7 +805,8 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {
                                        IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ |
                                        IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI,
                                .phy_cap_info[5] =
-                                       IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT,
+                                       FIELD_PREP_CONST(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK,
+                                                        IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US),
                        },
 
                        /* For all MCS and bandwidth, set 2 NSS for both Tx and
@@ -829,6 +834,9 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {
                        /*
                         * PPE thresholds for NSS = 2, and RU index bitmap set
                         * to 0xc.
+                        * Note: just for stating what we want, not present in
+                        * the transmitted data due to not including
+                        * IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT.
                         */
                        .eht_ppe_thres = {0xc1, 0x0e, 0xe0 }
                },