Commit 84ec2d2e authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Johannes Berg
Browse files

wifi: iwlwifi: disable 160 MHz based on subsystem device ID 



The driver should not send 160 MHz BW support for 5 GHz
band in HE if PCI subsystem device ID  indicates no 160 MHz support.

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Reviewed-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240126085924.77c248ce6986.I558e8d0cf19dc862b1c4124df78a4cb690095bb2@changeid


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

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

+4 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,10 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, 
			~IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;

	}



	if (trans->no_160)

		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] &=

			~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;



	if (trans->reduced_cap_sku) {

		memset(&iftype_data->eht_cap.eht_mcs_nss_supp.bw._320, 0,

		       sizeof(iftype_data->eht_cap.eht_mcs_nss_supp.bw._320));

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+2 −1
Original line number Diff line number Diff line
@@ -1069,6 +1069,7 @@ struct iwl_trans_txqs { 
 *	only valid for discrete (not integrated) NICs

 * @invalid_tx_cmd: invalid TX command buffer

 * @reduced_cap_sku: reduced capability supported SKU

 * @no_160: device not supporting 160 MHz

 */

struct iwl_trans {

	bool csme_own;
@@ -1092,7 +1093,7 @@ struct iwl_trans { 
	char hw_id_str[52];

	u32 sku_id[3];

	bool reduced_cap_sku;



	u8 no_160;

	u8 rx_mpdu_cmd, rx_mpdu_cmd_hdr_size;



	bool pm_support;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+1 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (dev_info) {

		iwl_trans->cfg = dev_info->cfg;

		iwl_trans->name = dev_info->name;

		iwl_trans->no_160 = dev_info->no_160 == IWL_CFG_NO_160;

	}



#if IS_ENABLED(CONFIG_IWLMVM)