Commit f06021a1 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: remove lar_disable module parameter 



This is an old parameter that was used supposed to be used only when
LAR was still under development.  It should not be used anymore, but,
since it's available, end-users have been mangling with it
unnecessarily.  In some cases it can cause problems because when LAR
is supported the driver and the firmware do not expect it to be
disabled.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 990aba28

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+0 −3
Original line number Diff line number Diff line
@@ -1817,9 +1817,6 @@ MODULE_PARM_DESC(antenna_coupling, 
module_param_named(nvm_file, iwlwifi_mod_params.nvm_file, charp, 0444);

MODULE_PARM_DESC(nvm_file, "NVM file name");



module_param_named(lar_disable, iwlwifi_mod_params.lar_disable, bool, 0444);

MODULE_PARM_DESC(lar_disable, "disable LAR functionality (default: N)");



module_param_named(uapsd_disable, iwlwifi_mod_params.uapsd_disable, uint, 0644);

MODULE_PARM_DESC(uapsd_disable,

		 "disable U-APSD functionality bitmap 1: BSS 2: P2P Client (default: 3)");

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

+0 −2
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ enum iwl_uapsd_disable { 
 * @nvm_file: specifies a external NVM file

 * @uapsd_disable: disable U-APSD, see &enum iwl_uapsd_disable, default =

 *	IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT

 * @lar_disable: disable LAR (regulatory), default = 0

 * @fw_monitor: allow to use firmware monitor

 * @disable_11ac: disable VHT capabilities, default = false.

 * @remove_when_gone: remove an inaccessible device from the PCIe bus.
@@ -136,7 +135,6 @@ struct iwl_mod_params { 
	int antenna_coupling;

	char *nvm_file;

	u32 uapsd_disable;

	bool lar_disable;

	bool fw_monitor;

	bool disable_11ac;

	/**

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

+7 −6
Original line number Diff line number Diff line
@@ -967,10 +967,11 @@ iwl_nvm_no_wide_in_5ghz(struct iwl_trans *trans, const struct iwl_cfg *cfg, 


struct iwl_nvm_data *

iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,

		   const struct iwl_fw *fw,

		   const __be16 *nvm_hw, const __le16 *nvm_sw,

		   const __le16 *nvm_calib, const __le16 *regulatory,

		   const __le16 *mac_override, const __le16 *phy_sku,

		   u8 tx_chains, u8 rx_chains, bool lar_fw_supported)

		   u8 tx_chains, u8 rx_chains)

{

	struct iwl_nvm_data *data;

	bool lar_enabled;
@@ -1050,7 +1051,8 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
		return NULL;

	}



	if (lar_fw_supported && lar_enabled)

	if (lar_enabled &&

	    fw_has_capa(&fw->ucode_capa, IWL_UCODE_TLV_CAPA_LAR_SUPPORT))

		sbands_flags |= IWL_NVM_SBANDS_FLAGS_LAR;



	if (iwl_nvm_no_wide_in_5ghz(trans, cfg, nvm_hw))
@@ -1449,9 +1451,6 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans, 
		.id = WIDE_ID(REGULATORY_AND_NVM_GROUP, NVM_GET_INFO)

	};

	int  ret;

	bool lar_fw_supported = !iwlwifi_mod_params.lar_disable &&

				fw_has_capa(&fw->ucode_capa,

					    IWL_UCODE_TLV_CAPA_LAR_SUPPORT);

	bool empty_otp;

	u32 mac_flags;

	u32 sbands_flags = 0;
@@ -1529,7 +1528,9 @@ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans, 
	nvm->valid_tx_ant = (u8)le32_to_cpu(rsp->phy_sku.tx_chains);

	nvm->valid_rx_ant = (u8)le32_to_cpu(rsp->phy_sku.rx_chains);



	if (le32_to_cpu(rsp->regulatory.lar_enabled) && lar_fw_supported) {

	if (le32_to_cpu(rsp->regulatory.lar_enabled) &&

	    fw_has_capa(&fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_LAR_SUPPORT)) {

		nvm->lar_enabled = true;

		sbands_flags |= IWL_NVM_SBANDS_FLAGS_LAR;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -85,10 +85,11 @@ enum iwl_nvm_sbands_flags { 
 */

struct iwl_nvm_data *

iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,

		   const struct iwl_fw *fw,

		   const __be16 *nvm_hw, const __le16 *nvm_sw,

		   const __le16 *nvm_calib, const __le16 *regulatory,

		   const __le16 *mac_override, const __le16 *phy_sku,

		   u8 tx_chains, u8 rx_chains, bool lar_fw_supported);

		   u8 tx_chains, u8 rx_chains);



/**

 * iwl_parse_mcc_info - parse MCC (mobile country code) info coming from FW

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −3
Original line number Diff line number Diff line
@@ -1298,9 +1298,6 @@ static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm) 
	bool tlv_lar = fw_has_capa(&mvm->fw->ucode_capa,

				   IWL_UCODE_TLV_CAPA_LAR_SUPPORT);



	if (iwlwifi_mod_params.lar_disable)

		return false;



	/*

	 * Enable LAR only if it is supported by the FW (TLV) &&

	 * enabled in the NVM

CRA Git | Maintained and supported by SUSTech CRA and CCSE