Commit 286ca8eb authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: add a pointer to the trans_cfg directly in trans 



Add a pointer to the iwl_trans structure and point it to the trans
part of the cfg.  This is the first step in disassociating the trans
configuration from the rest of the configuration.

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

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

+15 −15
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void iwl_fw_dump_rxf(struct iwl_fw_runtime *fwrt, 
		/* Pull RXF2 */

		iwl_fwrt_dump_rxf(fwrt, dump_data, cfg->rxfifo2_size,

				  RXF_DIFF_FROM_PREV +

				  fwrt->trans->cfg->trans.umac_prph_offset, 1);

				  fwrt->trans->trans_cfg->umac_prph_offset, 1);

		/* Pull LMAC2 RXF1 */

		if (fwrt->smem_cfg.num_lmacs > 1)

			iwl_fwrt_dump_rxf(fwrt, dump_data,
@@ -684,10 +684,10 @@ static void iwl_fw_prph_handler(struct iwl_fw_runtime *fwrt, void *ptr, 
{

	u32 range_len;



	if (fwrt->trans->cfg->trans.device_family >= IWL_DEVICE_FAMILY_AX210) {

	if (fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210) {

		range_len = ARRAY_SIZE(iwl_prph_dump_addr_ax210);

		handler(fwrt, iwl_prph_dump_addr_ax210, range_len, ptr);

	} else if (fwrt->trans->cfg->trans.device_family >=

	} else if (fwrt->trans->trans_cfg->device_family >=

		   IWL_DEVICE_FAMILY_22000) {

		range_len = ARRAY_SIZE(iwl_prph_dump_addr_22000);

		handler(fwrt, iwl_prph_dump_addr_22000, range_len, ptr);
@@ -695,7 +695,7 @@ static void iwl_fw_prph_handler(struct iwl_fw_runtime *fwrt, void *ptr, 
		range_len = ARRAY_SIZE(iwl_prph_dump_addr_comm);

		handler(fwrt, iwl_prph_dump_addr_comm, range_len, ptr);



		if (fwrt->trans->cfg->trans.mq_rx_supported) {

		if (fwrt->trans->trans_cfg->mq_rx_supported) {

			range_len = ARRAY_SIZE(iwl_prph_dump_addr_9000);

			handler(fwrt, iwl_prph_dump_addr_9000, range_len, ptr);

		}
@@ -857,7 +857,7 @@ iwl_fw_error_dump_file(struct iwl_fw_runtime *fwrt, 
			iwl_fw_prph_handler(fwrt, &prph_len,

					    iwl_fw_get_prph_len);



		if (fwrt->trans->cfg->trans.device_family ==

		if (fwrt->trans->trans_cfg->device_family ==

		    IWL_DEVICE_FAMILY_7000 &&

		    iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RADIO_REG))

			radio_len = sizeof(*dump_data) + RADIO_REG_MAX_READ;
@@ -1138,7 +1138,7 @@ static int iwl_dump_ini_paging_iter(struct iwl_fw_runtime *fwrt, 
	struct iwl_fw_ini_error_dump_range *range;

	u32 page_size;



	if (!fwrt->trans->cfg->trans.gen2)

	if (!fwrt->trans->trans_cfg->gen2)

		return _iwl_dump_ini_paging_iter(fwrt, reg, range_ptr, idx);



	range = range_ptr;
@@ -1444,7 +1444,7 @@ static void 
	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;

	u32 write_ptr_addr, write_ptr_msk, cycle_cnt_addr, cycle_cnt_msk;



	switch (fwrt->trans->cfg->trans.device_family) {

	switch (fwrt->trans->trans_cfg->device_family) {

	case IWL_DEVICE_FAMILY_9000:

	case IWL_DEVICE_FAMILY_22000:

		write_ptr_addr = MON_BUFF_WRPTR_VER2;
@@ -1454,7 +1454,7 @@ static void 
		break;

	default:

		IWL_ERR(fwrt, "Unsupported device family %d\n",

			fwrt->trans->cfg->trans.device_family);

			fwrt->trans->trans_cfg->device_family);

		return NULL;

	}
@@ -1471,10 +1471,10 @@ static void 
	struct iwl_fw_ini_monitor_dump *mon_dump = (void *)data;

	const struct iwl_cfg *cfg = fwrt->trans->cfg;



	if (fwrt->trans->cfg->trans.device_family != IWL_DEVICE_FAMILY_9000 &&

	    fwrt->trans->cfg->trans.device_family != IWL_DEVICE_FAMILY_22000) {

	if (fwrt->trans->trans_cfg->device_family != IWL_DEVICE_FAMILY_9000 &&

	    fwrt->trans->trans_cfg->device_family != IWL_DEVICE_FAMILY_22000) {

		IWL_ERR(fwrt, "Unsupported device family %d\n",

			fwrt->trans->cfg->trans.device_family);

			fwrt->trans->trans_cfg->device_family);

		return NULL;

	}
@@ -1495,7 +1495,7 @@ static u32 iwl_dump_ini_mem_ranges(struct iwl_fw_runtime *fwrt, 
static u32 iwl_dump_ini_paging_ranges(struct iwl_fw_runtime *fwrt,

				      struct iwl_fw_ini_region_cfg *reg)

{

	if (fwrt->trans->cfg->trans.gen2)

	if (fwrt->trans->trans_cfg->gen2)

		return fwrt->trans->init_dram.paging_cnt;



	return fwrt->num_of_paging_blk;
@@ -1543,7 +1543,7 @@ static u32 iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt, 
	u32 range_header_len = sizeof(struct iwl_fw_ini_error_dump_range);

	u32 size = sizeof(struct iwl_fw_ini_error_dump);



	if (fwrt->trans->cfg->trans.gen2) {

	if (fwrt->trans->trans_cfg->gen2) {

		for (i = 0; i < iwl_dump_ini_paging_ranges(fwrt, reg); i++)

			size += range_header_len +

				fwrt->trans->init_dram.paging[i].size;
@@ -2472,7 +2472,7 @@ static int iwl_fw_dbg_suspend_resume_hcmd(struct iwl_trans *trans, bool suspend) 
static void iwl_fw_dbg_stop_recording(struct iwl_trans *trans,

				      struct iwl_fw_dbg_params *params)

{

	if (trans->cfg->trans.device_family == IWL_DEVICE_FAMILY_7000) {

	if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_7000) {

		iwl_set_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x100);

		return;

	}
@@ -2496,7 +2496,7 @@ static int iwl_fw_dbg_restart_recording(struct iwl_trans *trans, 
	if (!params)

		return -EIO;



	if (trans->cfg->trans.device_family == IWL_DEVICE_FAMILY_7000) {

	if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_7000) {

		iwl_clear_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x100);

		iwl_clear_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x1);

		iwl_set_bits_prph(trans, MON_BUFF_SAMPLE_CTL, 0x1);

drivers/net/wireless/intel/iwlwifi/fw/dbg.h

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt) 
static inline bool iwl_fw_dbg_is_paging_enabled(struct iwl_fw_runtime *fwrt)

{

	return iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_PAGING) &&

		!fwrt->trans->cfg->trans.gen2 &&

		!fwrt->trans->trans_cfg->gen2 &&

		fwrt->cur_fw_img < IWL_UCODE_TYPE_MAX &&

		fwrt->fw->img[fwrt->cur_fw_img].paging_mem_size &&

		fwrt->fw_paging_db[0].fw_paging_block;

drivers/net/wireless/intel/iwlwifi/fw/paging.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int iwl_init_paging(struct iwl_fw_runtime *fwrt, enum iwl_ucode_type type) 
	const struct fw_img *fw = &fwrt->fw->img[type];

	int ret;



	if (fwrt->trans->cfg->trans.gen2)

	if (fwrt->trans->trans_cfg->gen2)

		return 0;



	/*

drivers/net/wireless/intel/iwlwifi/fw/smem.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ void iwl_get_shared_mem_conf(struct iwl_fw_runtime *fwrt) 
	}



	pkt = cmd.resp_pkt;

	if (fwrt->trans->cfg->trans.device_family >= IWL_DEVICE_FAMILY_22000)

	if (fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_22000)

		iwl_parse_shared_mem_22000(fwrt, pkt);

	else

		iwl_parse_shared_mem(fwrt, pkt);

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

+5 −5
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) 
	const struct iwl_cfg *cfg = drv->trans->cfg;

	char tag[8];



	if (drv->trans->cfg->trans.device_family == IWL_DEVICE_FAMILY_9000 &&

	if (drv->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_9000 &&

	    (CSR_HW_REV_STEP(drv->trans->hw_rev) != SILICON_B_STEP &&

	     CSR_HW_REV_STEP(drv->trans->hw_rev) != SILICON_C_STEP)) {

		IWL_ERR(drv,
@@ -1120,7 +1120,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 


			if (tlv_len != sizeof(*dbg_ptrs))

				goto invalid_tlv_len;

			if (drv->trans->cfg->trans.device_family <

			if (drv->trans->trans_cfg->device_family <

			    IWL_DEVICE_FAMILY_22000)

				break;

			drv->trans->dbg.umac_error_event_table =
@@ -1136,7 +1136,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 


			if (tlv_len != sizeof(*dbg_ptrs))

				goto invalid_tlv_len;

			if (drv->trans->cfg->trans.device_family <

			if (drv->trans->trans_cfg->device_family <

			    IWL_DEVICE_FAMILY_22000)

				break;

			drv->trans->dbg.lmac_error_event_table[0] =
@@ -1522,14 +1522,14 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
		fw->init_evtlog_size = (pieces->init_evtlog_size - 16)/12;

	else

		fw->init_evtlog_size =

			drv->trans->cfg->trans.base_params->max_event_log_size;

			drv->trans->trans_cfg->base_params->max_event_log_size;

	fw->init_errlog_ptr = pieces->init_errlog_ptr;

	fw->inst_evtlog_ptr = pieces->inst_evtlog_ptr;

	if (pieces->inst_evtlog_size)

		fw->inst_evtlog_size = (pieces->inst_evtlog_size - 16)/12;

	else

		fw->inst_evtlog_size =

			drv->trans->cfg->trans.base_params->max_event_log_size;

			drv->trans->trans_cfg->base_params->max_event_log_size;

	fw->inst_errlog_ptr = pieces->inst_errlog_ptr;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE