Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fde73834 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: nvm: remove reading valid antennas from NVM 



These values aren't used as the firmware values should be used,
so reading them is pointless and hides potential errors when
somebody uses these values. Leave them zero to make it clearer
that they can't be used. We can't remove the struct members as
the DVM driver does read the values from EEPROM/OTP and the
structure is shared between drivers.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 5fc0f76c

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

+0 −17
Original line number Diff line number Diff line
@@ -425,8 +425,6 @@ static void iwl_set_radio_cfg(const struct iwl_cfg *cfg, 
		data->radio_cfg_step = NVM_RF_CFG_STEP_MSK(radio_cfg);

		data->radio_cfg_dash = NVM_RF_CFG_DASH_MSK(radio_cfg);

		data->radio_cfg_pnum = NVM_RF_CFG_PNUM_MSK(radio_cfg);

		data->valid_tx_ant = NVM_RF_CFG_TX_ANT_MSK(radio_cfg);

		data->valid_rx_ant = NVM_RF_CFG_RX_ANT_MSK(radio_cfg);

		return;

	}
@@ -435,8 +433,6 @@ static void iwl_set_radio_cfg(const struct iwl_cfg *cfg, 
	data->radio_cfg_step = NVM_RF_CFG_STEP_MSK_FAMILY_8000(radio_cfg);

	data->radio_cfg_dash = NVM_RF_CFG_DASH_MSK_FAMILY_8000(radio_cfg);

	data->radio_cfg_pnum = NVM_RF_CFG_FLAVOR_MSK_FAMILY_8000(radio_cfg);

	data->valid_tx_ant = NVM_RF_CFG_TX_ANT_MSK_FAMILY_8000(radio_cfg);

	data->valid_rx_ant = NVM_RF_CFG_RX_ANT_MSK_FAMILY_8000(radio_cfg);

}



static void iwl_set_hw_address(const struct iwl_cfg *cfg,
@@ -496,19 +492,6 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg, 
	if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)

		data->sku_cap_11n_enable = false;



	/* check overrides (some devices have wrong NVM) */

	if (cfg->valid_tx_ant)

		data->valid_tx_ant = cfg->valid_tx_ant;

	if (cfg->valid_rx_ant)

		data->valid_rx_ant = cfg->valid_rx_ant;



	if (!data->valid_tx_ant || !data->valid_rx_ant) {

		IWL_ERR_DEV(dev, "invalid antennas (0x%x, 0x%x)\n",

			    data->valid_tx_ant, data->valid_rx_ant);

		kfree(data);

		return NULL;

	}



	data->n_hw_addrs = iwl_get_n_hw_addrs(cfg, nvm_sw);



	if (cfg->device_family != IWL_DEVICE_FAMILY_8000) {

drivers/net/wireless/iwlwifi/mvm/fw.c

+0 −2
Original line number Diff line number Diff line
@@ -358,8 +358,6 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
					GFP_KERNEL);

		if (!mvm->nvm_data)

			return -ENOMEM;

		mvm->nvm_data->valid_rx_ant = 1;

		mvm->nvm_data->valid_tx_ant = 1;

		mvm->nvm_data->bands[0].channels = mvm->nvm_data->channels;

		mvm->nvm_data->bands[0].n_channels = 1;

		mvm->nvm_data->bands[0].n_bitrates = 1;