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

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

iwlwifi: dbg: avoid passing trigger around 



The trigger structure is being passed around, when
all we care about is whether to dump only monitor
or not. Pass a bool instead.

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

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

+9 −11
Original line number Diff line number Diff line
@@ -655,13 +655,8 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	u32 smem_len = fwrt->fw->dbg.n_mem_tlv ? 0 : fwrt->trans->cfg->smem_len;

	u32 sram2_len = fwrt->fw->dbg.n_mem_tlv ?

				0 : fwrt->trans->cfg->dccm2_len;

	bool monitor_dump_only = false;

	int i;



	if (fwrt->dump.trig &&

	    fwrt->dump.trig->mode & IWL_FW_DBG_TRIGGER_MONITOR_ONLY)

		monitor_dump_only = true;



	/* SRAM - include stack CCM if driver knows the values for it */

	if (!fwrt->trans->cfg->dccm_offset || !fwrt->trans->cfg->dccm_len) {

		const struct fw_img *img;
@@ -727,7 +722,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	}



	/* If we only want a monitor dump, reset the file length */

	if (monitor_dump_only) {

	if (fwrt->dump.monitor_only) {

		file_len = sizeof(*dump_file) + sizeof(*dump_data) * 2 +

			   sizeof(*dump_info) + sizeof(*dump_smem_cfg);

	}
@@ -817,7 +812,7 @@ _iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, 
	}



	/* In case we only want monitor dump, skip to dump trasport data */

	if (monitor_dump_only)

	if (fwrt->dump.monitor_only)

		goto out;



	if (fwrt->fw->dbg.dump_mask & BIT(IWL_FW_ERROR_DUMP_MEM)) {
@@ -932,7 +927,7 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt) 
	}



	fw_error_dump->trans_ptr = iwl_trans_dump_data(fwrt->trans,

						       fwrt->dump.trig);

						       fwrt->dump.monitor_only);

	file_len = le32_to_cpu(dump_file->file_len);

	fw_error_dump->fwrt_len = file_len;

	if (fw_error_dump->trans_ptr) {
@@ -998,7 +993,8 @@ void iwl_fw_alive_error_dump(struct iwl_fw_runtime *fwrt) 
IWL_EXPORT_SYMBOL(iwl_fw_alive_error_dump);



int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,

			    const struct iwl_fw_dump_desc *desc, void *trigger,

			    const struct iwl_fw_dump_desc *desc,

			    bool monitor_only,

			    unsigned int delay)

{

	/*
@@ -1028,7 +1024,7 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt, 
		 le32_to_cpu(desc->trig_desc.type));



	fwrt->dump.desc = desc;

	fwrt->dump.trig = trigger;

	fwrt->dump.monitor_only = monitor_only;



	schedule_delayed_work(&fwrt->dump.wk, delay);
@@ -1043,6 +1039,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, 
{

	struct iwl_fw_dump_desc *desc;

	unsigned int delay = 0;

	bool monitor_only = false;



	if (trigger) {

		u16 occurrences = le16_to_cpu(trigger->occurrences) - 1;
@@ -1059,6 +1056,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, 


		trigger->occurrences = cpu_to_le16(occurrences);

		delay = le16_to_cpu(trigger->trig_dis_ms);

		monitor_only = trigger->mode & IWL_FW_DBG_TRIGGER_MONITOR_ONLY;

	}



	desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC);
@@ -1070,7 +1068,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, 
	desc->trig_desc.type = cpu_to_le32(trig);

	memcpy(desc->trig_desc.data, str, len);



	return iwl_fw_dbg_collect_desc(fwrt, desc, trigger, delay);

	return iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay);

}

IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect);

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

+1 −2
Original line number Diff line number Diff line
@@ -101,13 +101,12 @@ static inline void iwl_fw_free_dump_desc(struct iwl_fw_runtime *fwrt) 
	if (fwrt->dump.desc != &iwl_dump_desc_assert)

		kfree(fwrt->dump.desc);

	fwrt->dump.desc = NULL;

	fwrt->dump.trig = NULL;

}



void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt);

int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,

			    const struct iwl_fw_dump_desc *desc,

			    void *trigger, unsigned int delay);

			    bool monitor_only, unsigned int delay);

int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,

		       enum iwl_fw_dbg_trigger trig,

		       const char *str, size_t len,

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ struct iwl_fw_runtime { 
	/* debug */

	struct {

		const struct iwl_fw_dump_desc *desc;

		const struct iwl_fw_dbg_trigger_tlv *trig;

		bool monitor_only;

		struct delayed_work wk;



		u8 conf;

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

+3 −5
Original line number Diff line number Diff line
@@ -602,8 +602,7 @@ struct iwl_trans_ops { 
	void (*resume)(struct iwl_trans *trans);



	struct iwl_trans_dump_data *(*dump_data)(struct iwl_trans *trans,

						 const struct iwl_fw_dbg_trigger_tlv

						 *trigger);

						 bool monitor_only);

};



/**
@@ -897,12 +896,11 @@ static inline void iwl_trans_resume(struct iwl_trans *trans) 
}



static inline struct iwl_trans_dump_data *

iwl_trans_dump_data(struct iwl_trans *trans,

		    const struct iwl_fw_dbg_trigger_tlv *trigger)

iwl_trans_dump_data(struct iwl_trans *trans, bool monitor_only)

{

	if (!trans->ops->dump_data)

		return NULL;

	return trans->ops->dump_data(trans, trigger);

	return trans->ops->dump_data(trans, monitor_only);

}



static inline struct iwl_device_cmd *

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

+1 −1
Original line number Diff line number Diff line
@@ -1956,7 +1956,7 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 
		set_bit(STATUS_FW_ERROR, &mvm->trans->status);

		iwl_mvm_dump_nic_error_log(mvm);

		iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert,

					NULL, 0);

					false, 0);

		ret = 1;

		goto err;

	}