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

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

iwlwifi: dbg: use helper to check if debug type is set 



This enables to incorporate more logic in one place.

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

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

+18 −18
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void iwl_fw_dump_fifos(struct iwl_fw_runtime *fwrt, 
	if (!iwl_trans_grab_nic_access(fwrt->trans, &flags))

		return;



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_RXF)) {

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RXF)) {

		/* Pull RXF1 */

		iwl_fwrt_dump_rxf(fwrt, dump_data,

				  cfg->lmac[0].rxfifo1_size, 0, 0);
@@ -254,7 +254,7 @@ static void iwl_fw_dump_fifos(struct iwl_fw_runtime *fwrt, 
					  LMAC2_PRPH_OFFSET, 2);

	}



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_TXF)) {

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_TXF)) {

		/* Pull TXF data from LMAC1 */

		for (i = 0; i < fwrt->smem_cfg.num_txfifo_entries; i++) {

			/* Mark the number of TXF we're pulling now */
@@ -279,7 +279,7 @@ static void iwl_fw_dump_fifos(struct iwl_fw_runtime *fwrt, 
		}

	}



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_INTERNAL_TXF) &&

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_INTERNAL_TXF) &&

	    fw_has_capa(&fwrt->fw->ucode_capa,

			IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG)) {

		/* Pull UMAC internal TXF data from all TXFs */
@@ -603,7 +603,7 @@ static int iwl_fw_fifo_len(struct iwl_fw_runtime *fwrt, 
	u32 fifo_len = 0;

	int i;



	if (!(fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_RXF)))

	if (!iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RXF))

		goto dump_txf;



	/* Count RXF2 size */
@@ -614,7 +614,7 @@ static int iwl_fw_fifo_len(struct iwl_fw_runtime *fwrt, 
		ADD_LEN(fifo_len, mem_cfg->lmac[i].rxfifo1_size, hdr_len);



dump_txf:

	if (!(fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_TXF)))

	if (!iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_TXF))

		goto dump_internal_txf;



	/* Count TXF sizes */
@@ -627,7 +627,7 @@ static int iwl_fw_fifo_len(struct iwl_fw_runtime *fwrt, 
	}



dump_internal_txf:

	if (!((fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_INTERNAL_TXF)) &&

	if (!(iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_INTERNAL_TXF) &&

	      fw_has_capa(&fwrt->fw->ucode_capa,

			  IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG)))

		goto out;
@@ -675,22 +675,22 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 


		/* Make room for PRPH registers */

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

		    fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_PRPH))

		   iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_PRPH))

			prph_len += iwl_fw_get_prph_len(fwrt);



		if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_7000 &&

		    fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_RADIO_REG))

		    iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RADIO_REG))

			radio_len = sizeof(*dump_data) + RADIO_REG_MAX_READ;

	}



	file_len = sizeof(*dump_file) + fifo_len + prph_len + radio_len;



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_DEV_FW_INFO))

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_DEV_FW_INFO))

		file_len += sizeof(*dump_data) + sizeof(*dump_info);

	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_MEM_CFG))

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_MEM_CFG))

		file_len += sizeof(*dump_data) + sizeof(*dump_smem_cfg);



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_MEM)) {

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_MEM)) {

		size_t hdr_len = sizeof(*dump_data) +

				 sizeof(struct iwl_fw_error_dump_mem);
@@ -707,7 +707,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	}



	/* Make room for fw's virtual image pages, if it exists */

	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_PAGING) &&

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_PAGING) &&

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

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

	    fwrt->fw_paging_db[0].fw_paging_block)
@@ -727,7 +727,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
			   sizeof(*dump_info) + sizeof(*dump_smem_cfg);

	}



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_ERROR_INFO) &&

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_ERROR_INFO) &&

	    fwrt->dump.desc)

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

			    fwrt->dump.desc->len;
@@ -741,7 +741,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	dump_file->barker = cpu_to_le32(IWL_FW_ERROR_DUMP_BARKER);

	dump_data = (void *)dump_file->data;



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_DEV_FW_INFO)) {

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_DEV_FW_INFO)) {

		dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_DEV_FW_INFO);

		dump_data->len = cpu_to_le32(sizeof(*dump_info));

		dump_info = (void *)dump_data->data;
@@ -762,7 +762,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
		dump_data = iwl_fw_error_next_data(dump_data);

	}



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_MEM_CFG)) {

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_MEM_CFG)) {

		/* Dump shared memory configuration */

		dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_MEM_CFG);

		dump_data->len = cpu_to_le32(sizeof(*dump_smem_cfg));
@@ -799,7 +799,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
			iwl_read_radio_regs(fwrt, &dump_data);

	}



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_ERROR_INFO) &&

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_ERROR_INFO) &&

	    fwrt->dump.desc) {

		dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_ERROR_INFO);

		dump_data->len = cpu_to_le32(sizeof(*dump_trig) +
@@ -815,7 +815,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	if (fwrt->dump.monitor_only)

		goto out;



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_MEM)) {

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_MEM)) {

		const struct iwl_fw_dbg_mem_seg_tlv *fw_dbg_mem =

			fwrt->fw->dbg.mem_tlv;
@@ -860,7 +860,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	}



	/* Dump fw's virtual image */

	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_PAGING) &&

	if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_PAGING) &&

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

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

	    fwrt->fw_paging_db[0].fw_paging_block) {

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

+6 −1
Original line number Diff line number Diff line
@@ -309,12 +309,17 @@ static inline void iwl_fw_dump_conf_clear(struct iwl_fw_runtime *fwrt) 


void iwl_fw_error_dump_wk(struct work_struct *work);



static inline bool iwl_fw_dbg_type_on(struct iwl_fw_runtime *fwrt, u32 type)

{

	return (fwrt->fw->dbg.dump_mask & BIT(type));

}



static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt)

{

	return fw_has_capa(&fwrt->fw->ucode_capa,

			   IWL_UCODE_TLV_CAPA_D3_DEBUG) &&

		fwrt->trans->cfg->d3_debug_data_length &&

		fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);

		iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);

}



void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt);