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

Commit 8b4d6495 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: remove references to 8000 B-step devices 



We don't have any 8000 B-step right now, and there is no
firmware loading code for them anyway.
Further more, 9000 B-step devices will hit those code paths.
Remove code that was introduced only for 8000 B-step.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7042678d

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

+0 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ 
	IWL8265_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_8000		10

#define DEFAULT_NVM_FILE_FAMILY_8000B		"nvmData-8000B"

#define DEFAULT_NVM_FILE_FAMILY_8000C		"nvmData-8000C"



/* Max SDIO RX/TX aggregation sizes of the ADDBA request/response */
@@ -162,7 +161,6 @@ static const struct iwl_tt_params iwl8000_tt_params = { 
	.dccm2_len = IWL8260_DCCM2_LEN,					\

	.smem_offset = IWL8260_SMEM_OFFSET,				\

	.smem_len = IWL8260_SMEM_LEN,					\

	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,	\

	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,	\

	.thermal_params = &iwl8000_tt_params,				\

	.apmg_not_supported = true,					\

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

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ struct iwl_cfg { 
	const struct iwl_ht_params *ht_params;

	const struct iwl_eeprom_params *eeprom_params;

	const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;

	const char *default_nvm_file_B_step;

	const char *default_nvm_file_C_step;

	const struct iwl_tt_params *thermal_params;

	enum iwl_device_family device_family;

drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c

+0 −21
Original line number Diff line number Diff line
@@ -705,14 +705,6 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
			   sizeof(*dump_info);

	}



	/*

	 * In 8000 HW family B-step include the ICCM (which resides separately)

	 */

	if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&

	    CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP)

		file_len += sizeof(*dump_data) + sizeof(*dump_mem) +

			    IWL8260_ICCM_LEN;



	if (mvm->fw_dump_desc)

		file_len += sizeof(*dump_data) + sizeof(*dump_trig) +

			    mvm->fw_dump_desc->len;
@@ -837,19 +829,6 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm) 
		dump_data = iwl_fw_error_next_data(dump_data);

	}



	if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&

	    CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP) {

		dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM);

		dump_data->len = cpu_to_le32(IWL8260_ICCM_LEN +

					     sizeof(*dump_mem));

		dump_mem = (void *)dump_data->data;

		dump_mem->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_SRAM);

		dump_mem->offset = cpu_to_le32(IWL8260_ICCM_OFFSET);

		iwl_trans_read_mem_bytes(mvm->trans, IWL8260_ICCM_OFFSET,

					 dump_mem->data, IWL8260_ICCM_LEN);

		dump_data = iwl_fw_error_next_data(dump_data);

	}



	/* Dump fw's virtual image */

	if (!mvm->trans->cfg->gen2 &&

	    mvm->fw->img[mvm->cur_ucode].paging_mem_size &&

drivers/net/wireless/intel/iwlwifi/mvm/nvm.c

+2 −12
Original line number Diff line number Diff line
@@ -448,9 +448,7 @@ int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm) 


		/* nvm file validation, dword_buff[2] holds the file version */

		if ((CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_C_STEP &&

		     le32_to_cpu(dword_buff[2]) < 0xE4A) ||

		    (CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_B_STEP &&

		     le32_to_cpu(dword_buff[2]) >= 0xE4A)) {

		     le32_to_cpu(dword_buff[2]) < 0xE4A)) {

			ret = -EFAULT;

			goto out;

		}
@@ -644,7 +642,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) 
	int ret, section;

	u32 size_read = 0;

	u8 *nvm_buffer, *temp;

	const char *nvm_file_B = mvm->cfg->default_nvm_file_B_step;

	const char *nvm_file_C = mvm->cfg->default_nvm_file_C_step;



	if (WARN_ON_ONCE(mvm->cfg->nvm_hw_section_num >= NVM_MAX_NUM_SECTIONS))
@@ -714,13 +711,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic) 
		/* read External NVM file from the mod param */

		ret = iwl_mvm_read_external_nvm(mvm);

		if (ret) {

			/* choose the nvm_file name according to the

			 * HW step

			 */

			if (CSR_HW_REV_STEP(mvm->trans->hw_rev) ==

			    SILICON_B_STEP)

				mvm->nvm_file_name = nvm_file_B;

			else

			mvm->nvm_file_name = nvm_file_C;



			if ((ret == -EFAULT || ret == -ENOENT) &&