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

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

iwlwifi: dbg_ini: add periodic trigger support 



Allows to configure a periodic data collection

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

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

+40 −0
Original line number Original line Diff line number Diff line
@@ -2616,6 +2616,20 @@ static void iwl_fw_dbg_update_triggers(struct iwl_fw_runtime *fwrt, 
			active->trig->occurrences = cpu_to_le32(-1);

			active->trig->occurrences = cpu_to_le32(-1);





		active->active = true;

		active->active = true;



		if (id == IWL_FW_TRIGGER_ID_PERIODIC_TRIGGER) {

			u32 collect_interval = le32_to_cpu(trig->trigger_data);



			/* the minimum allowed interval is 50ms */

			if (collect_interval < 50) {

				collect_interval = 50;

				trig->trigger_data =

					cpu_to_le32(collect_interval);

			}



			mod_timer(&fwrt->dump.periodic_trig,

				  jiffies + msecs_to_jiffies(collect_interval));

		}

next:

next:

		iter += sizeof(*trig) + trig_regs_size;

		iter += sizeof(*trig) + trig_regs_size;
@@ -2696,8 +2710,34 @@ IWL_EXPORT_SYMBOL(iwl_fw_dbg_apply_point); 




void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt)

void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt)

{

{

	del_timer(&fwrt->dump.periodic_trig);

	iwl_fw_dbg_collect_sync(fwrt);

	iwl_fw_dbg_collect_sync(fwrt);





	iwl_trans_stop_device(fwrt->trans);

	iwl_trans_stop_device(fwrt->trans);

}

}

IWL_EXPORT_SYMBOL(iwl_fwrt_stop_device);

IWL_EXPORT_SYMBOL(iwl_fwrt_stop_device);



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));

	}

}

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -385,11 +385,13 @@ void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt); 




static inline void iwl_fw_flush_dump(struct iwl_fw_runtime *fwrt)

static inline void iwl_fw_flush_dump(struct iwl_fw_runtime *fwrt)

{

{

	del_timer(&fwrt->dump.periodic_trig);

	flush_delayed_work(&fwrt->dump.wk);

	flush_delayed_work(&fwrt->dump.wk);

}

}





static inline void iwl_fw_cancel_dump(struct iwl_fw_runtime *fwrt)

static inline void iwl_fw_cancel_dump(struct iwl_fw_runtime *fwrt)

{

{

	del_timer(&fwrt->dump.periodic_trig);

	cancel_delayed_work_sync(&fwrt->dump.wk);

	cancel_delayed_work_sync(&fwrt->dump.wk);

}

}
@@ -468,4 +470,5 @@ static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt) 
	}

	}

}

}





void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t);

#endif  /* __iwl_fw_dbg_h__ */
 
#endif  /* __iwl_fw_dbg_h__ */

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,8 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, 
	fwrt->ops_ctx = ops_ctx;

	fwrt->ops_ctx = ops_ctx;

	INIT_DELAYED_WORK(&fwrt->dump.wk, iwl_fw_error_dump_wk);

	INIT_DELAYED_WORK(&fwrt->dump.wk, iwl_fw_error_dump_wk);

	iwl_fwrt_dbgfs_register(fwrt, dbgfs_dir);

	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);

IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);

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

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

		u32 umac_err_id;

		void *fifo_iter;

		void *fifo_iter;

		enum iwl_fw_ini_trigger_id ini_trig_id;

		enum iwl_fw_ini_trigger_id ini_trig_id;

		struct timer_list periodic_trig;

	} dump;

	} dump;

#ifdef CONFIG_IWLWIFI_DEBUGFS

#ifdef CONFIG_IWLWIFI_DEBUGFS

	struct {

	struct {

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1261,6 +1261,7 @@ static void iwl_mvm_reprobe_wk(struct work_struct *wk) 
void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)

void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)

{

{

	iwl_abort_notification_waits(&mvm->notif_wait);

	iwl_abort_notification_waits(&mvm->notif_wait);

	del_timer(&mvm->fwrt.dump.periodic_trig);





	/*

	/*

	 * This is a bit racy, but worst case we tell mac80211 about

	 * This is a bit racy, but worst case we tell mac80211 about