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

Commit 9b1bcfcc authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: dbg_ini: remove periodic trigger 



Remove periodic trigger functionality.
After moving to the new API we will add periodic trigger functionality
that matches the new API.

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 4828f462

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

+1 −26
Original line number Diff line number Diff line
@@ -2381,7 +2381,7 @@ void iwl_fw_dbg_stop_sync(struct iwl_fw_runtime *fwrt) 
{

	int i;



	del_timer(&fwrt->dump.periodic_trig);

	iwl_dbg_tlv_del_timers(fwrt->trans);

	for (i = 0; i < IWL_FW_RUNTIME_DUMP_WK_NUM; i++)

		iwl_fw_dbg_collect_sync(fwrt, i);
@@ -2389,31 +2389,6 @@ void iwl_fw_dbg_stop_sync(struct iwl_fw_runtime *fwrt) 
}

IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_sync);



void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t)

{

	struct iwl_fw_runtime *fwrt;

	enum iwl_fw_ini_trigger_id id = IWL_FW_TRIGGER_ID_PERIODIC_TRIGGER;

	int ret;

	typeof(fwrt->dump) *dump_ptr = container_of(t, typeof(fwrt->dump),

						    periodic_trig);



	fwrt = container_of(dump_ptr, typeof(*fwrt), dump);



	ret = _iwl_fw_dbg_ini_collect(fwrt, id);

	if (!ret || ret == -EBUSY) {

		struct iwl_fw_ini_trigger *trig =

			fwrt->dump.active_trigs[id].trig;

		u32 occur = le32_to_cpu(trig->occurrences);

		u32 collect_interval = le32_to_cpu(trig->trigger_data);



		if (!occur)

			return;



		mod_timer(&fwrt->dump.periodic_trig,

			  jiffies + msecs_to_jiffies(collect_interval));

	}

}



#define FSEQ_REG(x) { .addr = (x), .str = #x, }



void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt)

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

+2 −4
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static inline void iwl_fw_flush_dumps(struct iwl_fw_runtime *fwrt) 
{

	int i;



	del_timer(&fwrt->dump.periodic_trig);

	iwl_dbg_tlv_del_timers(fwrt->trans);

	for (i = 0; i < IWL_FW_RUNTIME_DUMP_WK_NUM; i++) {

		flush_delayed_work(&fwrt->dump.wks[i].wk);

		fwrt->dump.wks[i].ini_trig_id = IWL_FW_TRIGGER_ID_INVALID;
@@ -325,7 +325,7 @@ static inline void iwl_fw_cancel_dumps(struct iwl_fw_runtime *fwrt) 
{

	int i;



	del_timer(&fwrt->dump.periodic_trig);

	iwl_dbg_tlv_del_timers(fwrt->trans);

	for (i = 0; i < IWL_FW_RUNTIME_DUMP_WK_NUM; i++) {

		cancel_delayed_work_sync(&fwrt->dump.wks[i].wk);

		fwrt->dump.wks[i].ini_trig_id = IWL_FW_TRIGGER_ID_INVALID;
@@ -400,8 +400,6 @@ static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt) 
	}

}



void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t);



void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt);



static inline void iwl_fwrt_update_fw_versions(struct iwl_fw_runtime *fwrt,

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

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, 
		INIT_DELAYED_WORK(&fwrt->dump.wks[i].wk, iwl_fw_error_dump_wk);

	}

	iwl_fwrt_dbgfs_register(fwrt, dbgfs_dir);

	timer_setup(&fwrt->dump.periodic_trig,

		    iwl_fw_dbg_periodic_trig_handler, 0);

}

IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);

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

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ struct iwl_fw_runtime { 
		u32 umac_err_id;



		struct iwl_txf_iter_data txf_iter_data;

		struct timer_list periodic_trig;



		u8 img_name[IWL_FW_INI_MAX_IMG_NAME_LEN];

		u8 internal_dbg_cfg_name[IWL_FW_INI_MAX_DBG_CFG_NAME_LEN];

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+6 −0
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ void iwl_dbg_tlv_alloc(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv, 
	*cfg_state = IWL_INI_CFG_STATE_CORRUPTED;

}



void iwl_dbg_tlv_del_timers(struct iwl_trans *trans)

{

	/* will be used later */

}

IWL_EXPORT_SYMBOL(iwl_dbg_tlv_del_timers);



void iwl_dbg_tlv_free(struct iwl_trans *trans)

{

	/* will be used again later */