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

Commit 76f8c0e1 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: pcie: remove dead code 



If device family is 8000 then iwl_pcie_load_cpu_sections()
won't be called at all (iwl_pcie_load_cpu_sections_8000() is
called in that case) so this piece of code never gets called.

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

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

+0 −13
Original line number Original line Diff line number Diff line
@@ -302,7 +302,6 @@ 
#define OSC_CLK_FORCE_CONTROL		(0x8)

#define OSC_CLK_FORCE_CONTROL		(0x8)





#define FH_UCODE_LOAD_STATUS		(0x1AF0)

#define FH_UCODE_LOAD_STATUS		(0x1AF0)

#define CSR_UCODE_LOAD_STATUS_ADDR	(0x1E70)





/*

/*

 * Replacing FH_UCODE_LOAD_STATUS

 * Replacing FH_UCODE_LOAD_STATUS
@@ -311,21 +310,9 @@ 
 */

 */

#define UREG_UCODE_LOAD_STATUS		(0xa05c40)

#define UREG_UCODE_LOAD_STATUS		(0xa05c40)





enum secure_load_status_reg {

	LMPM_CPU_UCODE_LOADING_STARTED			= 0x00000001,

	LMPM_CPU_HDRS_LOADING_COMPLETED			= 0x00000003,

	LMPM_CPU_UCODE_LOADING_COMPLETED		= 0x00000007,

	LMPM_CPU_STATUS_NUM_OF_LAST_COMPLETED		= 0x000000F8,

	LMPM_CPU_STATUS_NUM_OF_LAST_LOADED_BLOCK	= 0x0000FF00,

};



#define LMPM_SECURE_INSPECTOR_CODE_ADDR	(0x1E38)

#define LMPM_SECURE_INSPECTOR_DATA_ADDR	(0x1E3C)

#define LMPM_SECURE_UCODE_LOAD_CPU1_HDR_ADDR	(0x1E78)

#define LMPM_SECURE_UCODE_LOAD_CPU1_HDR_ADDR	(0x1E78)

#define LMPM_SECURE_UCODE_LOAD_CPU2_HDR_ADDR	(0x1E7C)

#define LMPM_SECURE_UCODE_LOAD_CPU2_HDR_ADDR	(0x1E7C)





#define LMPM_SECURE_INSPECTOR_CODE_MEM_SPACE	(0x400000)

#define LMPM_SECURE_INSPECTOR_DATA_MEM_SPACE	(0x402000)

#define LMPM_SECURE_CPU1_HDR_MEM_SPACE		(0x420000)

#define LMPM_SECURE_CPU1_HDR_MEM_SPACE		(0x420000)

#define LMPM_SECURE_CPU2_HDR_MEM_SPACE		(0x420400)

#define LMPM_SECURE_CPU2_HDR_MEM_SPACE		(0x420400)

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

+0 −8
Original line number Original line Diff line number Diff line
@@ -903,14 +903,6 @@ static int iwl_pcie_load_cpu_sections(struct iwl_trans *trans, 
			return ret;

			return ret;

	}

	}





	if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)

		iwl_set_bits_prph(trans,

				  CSR_UCODE_LOAD_STATUS_ADDR,

				  (LMPM_CPU_UCODE_LOADING_COMPLETED |

				   LMPM_CPU_HDRS_LOADING_COMPLETED |

				   LMPM_CPU_UCODE_LOADING_STARTED) <<

					shift_param);



	*first_ucode_section = last_read_idx;

	*first_ucode_section = last_read_idx;





	return 0;

	return 0;