Skip to contentSkip to conversation

wifi: iwlwifi: updates intended for v6.2 2022-11-22

PATCH In review [email protected] 2 participants 11 messages Nov 22, 2022 – Nov 23, 2022 Intel wireless wifi link (iwlwifi)

lore
Share & tools
lore
#0 lore raw

v2 cover wifi: iwlwifi: updates intended for v6.2 2022-11-22

From: Gregory Greenman <[email protected]>

Hi,

Here's the third set of patches intended for v6.2, with the fixes. Resending all the patches since I think it'll make the review easier. The fixes are only for two patches (1 and 4), the rest are unchanged.

It contains EHT adjustments for iwlwifi. It contains only iwlwifi changes, all the required mac80211/cfg80211 changes are already merged upstream.

As usual, I'm pushing this to a pending branch, for kbuild bot, and will send a pull-request later.

Please review.

Thanks,
Gregory.

Abhishek Naik (1):
wifi: iwlwifi: nvm: Update EHT capabilities for GL device

Ilan Peer (1):
wifi: iwlwifi: mvm: Advertise EHT capabilities

Johannes Berg (4):
wifi: iwlwifi: mvm: support 320 MHz PHY configuration
wifi: iwlwifi: mvm: set HE PHY bandwidth according to band
wifi: iwlwifi: mvm: advertise 320 MHz in 6 GHz only conditionally
wifi: iwlwifi: nvm-parse: support A-MPDU in EHT 2.4 GHz

Miri Korenblit (1):
wifi: iwlwifi: mvm: support PPE Thresholds for EHT

Mordechay Goodstein (2):
wifi: iwlwifi: rs: add support for parsing max MCS per NSS/BW in 11be
wifi: iwlwifi: mvm: add support for EHT 1K aggregation size

 .../net/wireless/intel/iwlwifi/fw/api/mac.h   |   6 +-
 .../wireless/intel/iwlwifi/fw/api/phy-ctxt.h  |  33 ++-
 .../net/wireless/intel/iwlwifi/fw/api/rs.h    |  10 +-
 drivers/net/wireless/intel/iwlwifi/fw/rs.c    |   2 +
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c  |   3 +
 .../wireless/intel/iwlwifi/iwl-eeprom-parse.h |   3 +-
 .../wireless/intel/iwlwifi/iwl-modparams.h    |   1 +
 .../wireless/intel/iwlwifi/iwl-nvm-parse.c    | 235 ++++++++++++++++--
 .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 179 ++++++++++---
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c  |  10 +-
 .../net/wireless/intel/iwlwifi/mvm/phy-ctxt.c |  54 ++--
 .../net/wireless/intel/iwlwifi/mvm/rs-fw.c    | 125 +++++++++-
 12 files changed, 548 insertions(+), 113 deletions(-)
Signature · 1 line
2.35.3
#1 lore raw

PATCH v2 1/9 wifi: iwlwifi: mvm: Advertise EHT capabilities

From: Ilan Peer <[email protected]>

Add support for advertising EHT capabilities if supported by device SKU and not disabled by module parameters.

---
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c  |   3 +
 .../wireless/intel/iwlwifi/iwl-eeprom-parse.h |   3 +-
 .../wireless/intel/iwlwifi/iwl-modparams.h    |   1 +
 .../wireless/intel/iwlwifi/iwl-nvm-parse.c    | 178 ++++++++++++++++--
 4 files changed, 167 insertions(+), 18 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +3 -0
index a2203f661321..ab7065c93826 100644
@@ -1971,3 +1971,6 @@ MODULE_PARM_DESC(remove_when_gone,
 module_param_named(disable_11ax, iwlwifi_mod_params.disable_11ax, bool,
 		   S_IRUGO);
 MODULE_PARM_DESC(disable_11ax, "Disable HE capabilities (default: false)");
+
+module_param_named(disable_11be, iwlwifi_mod_params.disable_11be, bool, 0444);
+MODULE_PARM_DESC(disable_11be, "Disable EHT capabilities (default: false)");
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h +2 -1
index 0efffb6eeb1e..baa643386018 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2005-2014, 2018 Intel Corporation
+ * Copyright (C) 2005-2014, 2018, 2020-2022 Intel Corporation
  * Copyright (C) 2015 Intel Mobile Communications GmbH
  */
 #ifndef __iwl_eeprom_parse_h__
@@ -31,6 +31,7 @@ struct iwl_nvm_data {
 	bool sku_cap_amt_enable;
 	bool sku_cap_ipan_enable;
 	bool sku_cap_mimo_disabled;
+	bool sku_cap_11be_enable;
 
 	u16 radio_cfg_type;
 	u8 radio_cfg_step;
drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +1 -0
index d0b4d02bdab9..1cf26ab4f488 100644
@@ -62,6 +62,7 @@ enum iwl_uapsd_disable {
  * @disable_11ac: disable VHT capabilities, default = false.
  * @remove_when_gone: remove an inaccessible device from the PCIe bus.
  * @enable_ini: enable new FW debug infratructure (INI TLVs)
+ * @disable_11be: disable EHT capabilities, default = false.
  */
 struct iwl_mod_params {
 	int swcrypto;
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +161 -17

232 lines not on this page · raw message

Signature · 1 line
2.35.3
#2 lore raw

PATCH v2 2/9 wifi: iwlwifi: mvm: support 320 MHz PHY configuration

In reply to [email protected]

From: Johannes Berg <[email protected]>

Support 320 MHz PHY configuration and while doing so rewrite the code since we'd otherwise double the number of cases in the switch statement.

---
 .../wireless/intel/iwlwifi/fw/api/phy-ctxt.h  | 33 ++++++------
 .../net/wireless/intel/iwlwifi/mvm/mac80211.c |  2 +-
 .../net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 54 +++++++++----------
 3 files changed, 44 insertions(+), 45 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h +16 -17
index e66f77924f83..2f7d8558becd 100644
@@ -13,10 +13,12 @@
 #define PHY_BAND_6 (2)
 
 /* Supported channel width, vary if there is VHT support */
-#define PHY_VHT_CHANNEL_MODE20	(0x0)
-#define PHY_VHT_CHANNEL_MODE40	(0x1)
-#define PHY_VHT_CHANNEL_MODE80	(0x2)
-#define PHY_VHT_CHANNEL_MODE160	(0x3)
+#define IWL_PHY_CHANNEL_MODE20	0x0
+#define IWL_PHY_CHANNEL_MODE40	0x1
+#define IWL_PHY_CHANNEL_MODE80	0x2
+#define IWL_PHY_CHANNEL_MODE160	0x3
+/* and 320 MHz for EHT */
+#define IWL_PHY_CHANNEL_MODE320	0x4
 
 /*
  * Control channel position:
@@ -24,20 +26,17 @@
  * For VHT - bit-2 marks if the control is lower/upper relative to center-freq
  *   bits-1:0 mark the distance from the center freq. for 20Mhz, offset is 0.
  *                                   center_freq
- *                                        |
- * 40Mhz                          |_______|_______|
- * 80Mhz                  |_______|_______|_______|_______|
- * 160Mhz |_______|_______|_______|_______|_______|_______|_______|_______|
- * code      011     010     001     000  |  100     101     110    111
+ * For EHT - bit-3 is used for extended distance
+ *                                                |
+ * 40Mhz                                     |____|____|
+ * 80Mhz                                |____|____|____|____|
+ * 160Mhz                     |____|____|____|____|____|____|____|____|
+ * 320MHz |____|____|____|____|____|____|____|____|____|____|____|____|____|____|____|____|
+ * code    1011 1010 1001 1000 0011 0010 0001 0000 0100 0101 0110 0111 1100 1101 1110 1111
  */
-#define PHY_VHT_CTRL_POS_1_BELOW  (0x0)
-#define PHY_VHT_CTRL_POS_2_BELOW  (0x1)
-#define PHY_VHT_CTRL_POS_3_BELOW  (0x2)
-#define PHY_VHT_CTRL_POS_4_BELOW  (0x3)
-#define PHY_VHT_CTRL_POS_1_ABOVE  (0x4)
-#define PHY_VHT_CTRL_POS_2_ABOVE  (0x5)
-#define PHY_VHT_CTRL_POS_3_ABOVE  (0x6)
-#define PHY_VHT_CTRL_POS_4_ABOVE  (0x7)
+#define IWL_PHY_CTRL_POS_ABOVE		0x4
+#define IWL_PHY_CTRL_POS_OFFS_EXT	0x8
+#define IWL_PHY_CTRL_POS_OFFS_MSK	0x3
 
 /*
  * struct iwl_fw_channel_info_v1 - channel information
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +1 -1
index a81dd488caa8..57aa10466637 100644
@@ -3777,7 +3777,7 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,
 	/* Set the channel info data */
 	iwl_mvm_set_chan_info(mvm, &aux_roc_req.channel_info, channel->hw_value,
 			      iwl_mvm_phy_band_from_nl80211(channel->band),
-			      PHY_VHT_CHANNEL_MODE20,
+			      IWL_PHY_CHANNEL_MODE20,
 			      0);
 
 	/* Set the time and duration */
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +27 -27

77 lines not on this page · raw message

Signature · 1 line
2.35.3
#3 lore raw

PATCH v2 3/9 wifi: iwlwifi: rs: add support for parsing max MCS per NSS/BW in 11be

In reply to [email protected]

From: Mordechay Goodstein <[email protected]>

Rate scale needs to be configured to what MCS it can use per BW and NSS, this is done by parsing our capabilities of TX and peer's capabilities of RX and setting the minimum for rate scale usage.

Also do some cleanup removing redundant enum defines not used by FW/Driver.

---
 .../net/wireless/intel/iwlwifi/fw/api/rs.h    |  10 +-
 drivers/net/wireless/intel/iwlwifi/fw/rs.c    |   2 +
 .../net/wireless/intel/iwlwifi/mvm/rs-fw.c    | 125 +++++++++++++++++-
 3 files changed, 129 insertions(+), 8 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/rs.h +4 -6
index 687f804c46b7..ddacd5b45aea 100644
@@ -36,14 +36,14 @@ enum iwl_tlc_mng_cfg_flags {
  * @IWL_TLC_MNG_CH_WIDTH_40MHZ: 40MHZ channel
  * @IWL_TLC_MNG_CH_WIDTH_80MHZ: 80MHZ channel
  * @IWL_TLC_MNG_CH_WIDTH_160MHZ: 160MHZ channel
- * @IWL_TLC_MNG_CH_WIDTH_LAST: maximum value
+ * @IWL_TLC_MNG_CH_WIDTH_320MHZ: 320MHZ channel
  */
 enum iwl_tlc_mng_cfg_cw {
 	IWL_TLC_MNG_CH_WIDTH_20MHZ,
 	IWL_TLC_MNG_CH_WIDTH_40MHZ,
 	IWL_TLC_MNG_CH_WIDTH_80MHZ,
 	IWL_TLC_MNG_CH_WIDTH_160MHZ,
-	IWL_TLC_MNG_CH_WIDTH_LAST = IWL_TLC_MNG_CH_WIDTH_160MHZ,
+	IWL_TLC_MNG_CH_WIDTH_320MHZ,
 };
 
 /**
@@ -64,8 +64,7 @@ enum iwl_tlc_mng_cfg_chains {
  * @IWL_TLC_MNG_MODE_HT: enable HT
  * @IWL_TLC_MNG_MODE_VHT: enable VHT
  * @IWL_TLC_MNG_MODE_HE: enable HE
- * @IWL_TLC_MNG_MODE_INVALID: invalid value
- * @IWL_TLC_MNG_MODE_NUM: a count of possible modes
+ * @IWL_TLC_MNG_MODE_EHT: enable EHT
  */
 enum iwl_tlc_mng_cfg_mode {
 	IWL_TLC_MNG_MODE_CCK = 0,
@@ -74,8 +73,7 @@ enum iwl_tlc_mng_cfg_mode {
 	IWL_TLC_MNG_MODE_HT,
 	IWL_TLC_MNG_MODE_VHT,
 	IWL_TLC_MNG_MODE_HE,
-	IWL_TLC_MNG_MODE_INVALID,
-	IWL_TLC_MNG_MODE_NUM = IWL_TLC_MNG_MODE_INVALID,
+	IWL_TLC_MNG_MODE_EHT,
 };
 
 /**
drivers/net/wireless/intel/iwlwifi/fw/rs.c +2 -0
index a835214611ce..e128d2e07f38 100644
@@ -218,6 +218,8 @@ int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate)
 		type = "HT";
 	else if (format == RATE_MCS_HE_MSK)
 		type = "HE";
+	else if (format == RATE_MCS_EHT_MSK)
+		type = "EHT";
 	else
 		type = "Unknown"; /* shouldn't happen */
 
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c +123 -2

145 lines not on this page · raw message

Signature · 1 line
2.35.3
#4 lore raw

PATCH v2 4/9 wifi: iwlwifi: mvm: add support for EHT 1K aggregation size

In reply to [email protected]

From: Mordechay Goodstein <[email protected]>

In 11be we can receive 1K aggregation size so update our max HW rx aggregation for mac80211 usage.

---
 drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +8 -2
index 9699433137bc..2a4db13c9dcf 100644
@@ -1077,6 +1077,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 	static const u8 no_reclaim_cmds[] = {
 		TX_CMD,
 	};
+	u32 max_agg;
 	size_t scan_size;
 	u32 min_backoff;
 	struct iwl_mvm_csme_conn_info *csme_conn_info __maybe_unused;
@@ -1098,12 +1099,17 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 	if (!hw)
 		return NULL;
 
-	hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
+	if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)
+		max_agg = IEEE80211_MAX_AMPDU_BUF_EHT;
+	else
+		max_agg = IEEE80211_MAX_AMPDU_BUF_HE;
+
+	hw->max_rx_aggregation_subframes = max_agg;
 
 	if (cfg->max_tx_agg_size)
 		hw->max_tx_aggregation_subframes = cfg->max_tx_agg_size;
 	else
-		hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE;
+		hw->max_tx_aggregation_subframes = max_agg;
 
 	op_mode = hw->priv;
 
Signature · 1 line
2.35.3
#5 lore raw

PATCH v2 5/9 wifi: iwlwifi: mvm: support PPE Thresholds for EHT

In reply to [email protected]

From: Miri Korenblit <[email protected]>

In an EHT connection fill in the HE context command
with PPE Thresholds field from EHT Capabilities IE.
If PPE Thresholds field presents only in HE Capabilities IE, take the thresholds from there.
If it's not present in both - set the Common Nominal Packet Padding field from EHT Capabilities IE.

---
 .../net/wireless/intel/iwlwifi/fw/api/mac.h   |   6 +-
 .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 177 +++++++++++++++---
 2 files changed, 153 insertions(+), 30 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/mac.h +3 -3
index 9b7caf968346..e3eda251c728 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2022 Intel Corporation
  * Copyright (C) 2017 Intel Deutschland GmbH
  */
 #ifndef __iwl_fw_api_mac_h__
@@ -398,7 +398,7 @@ struct iwl_he_backoff_conf {
  * @IWL_HE_PKT_EXT_64QAM: 64-QAM
  * @IWL_HE_PKT_EXT_256QAM: 256-QAM
  * @IWL_HE_PKT_EXT_1024QAM: 1024-QAM
- * @IWL_HE_PKT_EXT_RESERVED: reserved value
+ * @IWL_HE_PKT_EXT_4096QAM: 4096-QAM, for EHT only
  * @IWL_HE_PKT_EXT_NONE: not defined
  */
 enum iwl_he_pkt_ext_constellations {
@@ -408,7 +408,7 @@ enum iwl_he_pkt_ext_constellations {
 	IWL_HE_PKT_EXT_64QAM,
 	IWL_HE_PKT_EXT_256QAM,
 	IWL_HE_PKT_EXT_1024QAM,
-	IWL_HE_PKT_EXT_RESERVED,
+	IWL_HE_PKT_EXT_4096QAM,
 	IWL_HE_PKT_EXT_NONE,
 };
 
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +150 -27

259 lines not on this page · raw message

Signature · 1 line
2.35.3
#6 lore raw

PATCH v2 6/9 wifi: iwlwifi: mvm: set HE PHY bandwidth according to band

In reply to [email protected]

From: Johannes Berg <[email protected]>

The bits are reserved on the opposite bands, so we shouldn't always send them, only the 2G bit on 2.4 GHz and the 5G bits on 5/6GHz. Fix that.

---
 .../wireless/intel/iwlwifi/iwl-nvm-parse.c    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +17 -10
index 2b43fff4d3f9..e83382ded8af 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2005-2014, 2018-2021 Intel Corporation
+ * Copyright (C) 2005-2014, 2018-2022 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
@@ -571,10 +571,6 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {
 					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |
 					IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS |
 					IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX,
-				.phy_cap_info[0] =
-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |
-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G,
 				.phy_cap_info[1] =
 					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
 					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
@@ -716,9 +712,6 @@ static const struct ieee80211_sband_iftype_data iwl_he_eht_capa[] = {
 					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
 				.mac_cap_info[3] =
 					IEEE80211_HE_MAC_CAP3_OMI_CONTROL,
-				.phy_cap_info[0] =
-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |
-					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G,
 				.phy_cap_info[1] =
 					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,
 				.phy_cap_info[2] =
@@ -874,9 +867,23 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
 		iftype_data->he_cap.he_cap_elem.mac_cap_info[3] |=
 			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3;
 
-	if (is_ap && iwlwifi_mod_params.nvm_file)
+	switch (sband->band) {
+	case NL80211_BAND_2GHZ:
 		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
-			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;
+		break;
+	case NL80211_BAND_6GHZ:
+	case NL80211_BAND_5GHZ:
+		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
+			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;
+		if (!is_ap || iwlwifi_mod_params.nvm_file)
+			iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
+				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
+		break;
+	default:
+		WARN_ON(1);
+		break;
+	}
 
 	if ((tx_chains & rx_chains) == ANT_AB) {
 		iftype_data->he_cap.he_cap_elem.phy_cap_info[2] |=
Signature · 1 line
2.35.3
#7 lore raw

PATCH v2 7/9 wifi: iwlwifi: mvm: advertise 320 MHz in 6 GHz only conditionally

In reply to [email protected]

From: Johannes Berg <[email protected]>

We can't have it in AP mode unless for debug, since we don't have 160 MHz in HE PHY capabilities, and also set it only in 6 GHz even if (unlike in HE) it's always defined.

---
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +4 -0
index e83382ded8af..b59e61a76b70 100644
@@ -873,6 +873,10 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
 			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;
 		break;
 	case NL80211_BAND_6GHZ:
+		if (!is_ap || iwlwifi_mod_params.nvm_file)
+			iftype_data->eht_cap.eht_cap_elem.phy_cap_info[0] |=
+				IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;
+		fallthrough;
 	case NL80211_BAND_5GHZ:
 		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
 			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G;
Signature · 1 line
2.35.3
#8 lore raw

PATCH v2 8/9 wifi: iwlwifi: nvm-parse: support A-MPDU in EHT 2.4 GHz

In reply to [email protected]

From: Johannes Berg <[email protected]>

We support large A-MPDU in EHT in 2.4 GHz, so add the right bits for that in the EHT capabilities.

---
 drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +3 -0
index b59e61a76b70..3a646bce7b42 100644
@@ -871,6 +871,9 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
 	case NL80211_BAND_2GHZ:
 		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] |=
 			IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G;
+		iftype_data->eht_cap.eht_cap_elem.mac_cap_info[0] |=
+			u8_encode_bits(IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454,
+				       IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK);
 		break;
 	case NL80211_BAND_6GHZ:
 		if (!is_ap || iwlwifi_mod_params.nvm_file)
Signature · 1 line
2.35.3
#9 lore raw

PATCH v2 9/9 wifi: iwlwifi: nvm: Update EHT capabilities for GL device

In reply to [email protected]

From: Abhishek Naik <[email protected]>

Update EHT MAC and PHY capabilities for GL device for station and softap interface.
Add relevant code in nvm_fixup_sband_iftd.

---
 .../wireless/intel/iwlwifi/iwl-nvm-parse.c    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +23 -0
index 3a646bce7b42..476b90f32626 100644
@@ -950,6 +950,29 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
 		break;
 	}
 
+	if (CSR_HW_REV_TYPE(trans->hw_rev) == IWL_CFG_MAC_TYPE_GL &&
+	    iftype_data->eht_cap.has_eht) {
+		iftype_data->eht_cap.eht_cap_elem.mac_cap_info[0] &=
+			~(IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS |
+			  IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE1 |
+			  IEEE80211_EHT_MAC_CAP0_TRIG_TXOP_SHARING_MODE2);
+		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[3] &=
+			~(IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO |
+			  IEEE80211_EHT_PHY_CAP3_NG_16_SU_FEEDBACK |
+			  IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |
+			  IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |
+			  IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK |
+			  IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK);
+		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[4] &=
+			~(IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO |
+			  IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP);
+		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[5] &=
+			~IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK;
+		iftype_data->eht_cap.eht_cap_elem.phy_cap_info[6] &=
+			~(IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK |
+			  IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP);
+	}
+
 	if (fw_has_capa(&fw->ucode_capa, IWL_UCODE_TLV_CAPA_BROADCAST_TWT))
 		iftype_data->he_cap.he_cap_elem.mac_cap_info[2] |=
 			IEEE80211_HE_MAC_CAP2_BCAST_TWT;
Signature · 1 line
2.35.3
#10 lore raw
In reply to [email protected]
Quoted 8 lines · [email protected] writes:

From: Gregory Greenman <[email protected]>

Hi,

Here's the third set of patches intended for v6.2, with the fixes. Resending all the patches since I think it'll make the review easier. The fixes are only for two patches (1 and 4), the rest are unchanged.

Quoted 8 lines

It contains EHT adjustments for iwlwifi. It contains only iwlwifi changes, all the required mac80211/cfg80211 changes are already merged upstream.

As usual, I'm pushing this to a pending branch, for kbuild bot, and will send a pull-request later.

Please review.

No need to resend because of this but there's no changelog to list the changes since v1. Usually we do something like this (I'm making up the content, I don't know what you actually changed):

v2

* patch 1: fix a typo in the commit log

* patch 5: add missing mutex_unlock() in error handling

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches