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

iwlwifi: dbg: move debug recording stop from trans to op mode



The op mode should stop the debug recording and not the transport layer.
Rename iwl_fwrt_stop_device into iwl_fw_dbg_stop_sync and move the debug
stop recording to it.

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent b721f5b1
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2862,7 +2862,7 @@ void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
}
IWL_EXPORT_SYMBOL(iwl_fw_dbg_apply_point);

void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt)
void iwl_fw_dbg_stop_sync(struct iwl_fw_runtime *fwrt)
{
	int i;

@@ -2870,9 +2870,9 @@ void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt)
	for (i = 0; i < IWL_FW_RUNTIME_DUMP_WK_NUM; i++)
		iwl_fw_dbg_collect_sync(fwrt, i);

	iwl_trans_stop_device(fwrt->trans);
	iwl_fw_dbg_stop_recording(fwrt->trans, NULL);
}
IWL_EXPORT_SYMBOL(iwl_fwrt_stop_device);
IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_sync);

void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t)
{
+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static inline void iwl_fw_resume_timestamp(struct iwl_fw_runtime *fwrt) {}
void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
			    enum iwl_fw_ini_apply_point apply_point);

void iwl_fwrt_stop_device(struct iwl_fw_runtime *fwrt);
void iwl_fw_dbg_stop_sync(struct iwl_fw_runtime *fwrt);

static inline void iwl_fw_lmac1_set_alive_err_table(struct iwl_trans *trans,
						    u32 lmac_error_event_table)
+1 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,7 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm)
		return ret;
	}

	iwl_fw_dbg_stop_sync(&mvm->fwrt);
	/*
	 * Stop and start the transport without entering low power
	 * mode. This will save the state of other components on the
+2 −1
Original line number Diff line number Diff line
@@ -2037,7 +2037,8 @@ static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)
	lockdep_assert_held(&mvm->mutex);
	iwl_fw_cancel_timestamp(&mvm->fwrt);
	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);
	iwl_fwrt_stop_device(&mvm->fwrt);
	iwl_fw_dbg_stop_sync(&mvm->fwrt);
	iwl_trans_stop_device(mvm->trans);
	iwl_free_fw_paging(&mvm->fwrt);
	iwl_fw_dump_conf_clear(&mvm->fwrt);
}
+0 −3
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)

	trans_pcie->is_down = true;

	/* Stop dbgc before stopping device */
	iwl_fw_dbg_stop_recording(trans, NULL);

	/* tell the device to stop sending interrupts */
	iwl_disable_interrupts(trans);

Loading