Received-SPF: pass (google.com: domain of linux-wireless+bounces-2434-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <42fbabd5-d77d-430b-b2c1-e4e829fa0776@quicinc.com>
Date: Tue, 23 Jan 2024 19:45:18 -0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 05/15] wifi: iwlwifi: disable 160Mhz based on SSID
Content-Language: en-US
To: Miri Korenblit <miriam.rachel.korenblit@intel.com>,
        <johannes@sipsolutions.net>
CC: <linux-wireless@vger.kernel.org>,
        Mukesh Sisodiya
	<mukesh.sisodiya@intel.com>,
        Mordechay Goodstein
	<mordechay.goodstein@intel.com>
References: <20240123180823.2441162-1-miriam.rachel.korenblit@intel.com>
 <20240123200528.776b395ee915.I558e8d0cf19dc862b1c4124df78a4cb690095bb2@changeid>
From: Jeff Johnson <quic_jjohnson@quicinc.com>
In-Reply-To: <20240123200528.776b395ee915.I558e8d0cf19dc862b1c4124df78a4cb690095bb2@changeid>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

On 1/23/2024 10:08 AM, Miri Korenblit wrote:
> From: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
> 
> The driver should not send 160Mhz BW support for 5Ghz

s/Mhz/MHz/?
s/Ghz/GHz/?

> band in HE if PCI Subsystem read indicates no 160Mhz support.
> 
> Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com>
> Reviewed-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
> ---
>  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 ++++
>  drivers/net/wireless/intel/iwlwifi/iwl-trans.h     | 3 ++-
>  drivers/net/wireless/intel/iwlwifi/pcie/drv.c      | 1 +
>  3 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> index 3f62f10a7c37..67c7cda073e8 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> @@ -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));
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
> index 9e26c9eb6d83..9867e29a56ff 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
> @@ -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 160Mhz

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;
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> index 42680d8469f5..c80b02503b41 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> @@ -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)