iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Shahar S Matityahu
2019-05-22 13:47:29 +03:00
committed by Luca Coelho
parent b721f5b1be
commit 203c83d3b2
6 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/intel/iwlwifi/fw/dbg.c
View File

@ -2862,7 +2862,7 @@ void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
} }
IWL_EXPORT_SYMBOL(iwl_fw_dbg_apply_point); 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; 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++) for (i = 0; i < IWL_FW_RUNTIME_DUMP_WK_NUM; i++)
iwl_fw_dbg_collect_sync(fwrt, 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) void iwl_fw_dbg_periodic_trig_handler(struct timer_list *t)
{ {

2
drivers/net/wireless/intel/iwlwifi/fw/dbg.h
View File

@ -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, void iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt,
enum iwl_fw_ini_apply_point apply_point); 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, static inline void iwl_fw_lmac1_set_alive_err_table(struct iwl_trans *trans,
u32 lmac_error_event_table) u32 lmac_error_event_table)

1
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
View File

@ -1140,6 +1140,7 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm)
return ret; return ret;
} }
iwl_fw_dbg_stop_sync(&mvm->fwrt);
/* /*
* Stop and start the transport without entering low power * Stop and start the transport without entering low power
* mode. This will save the state of other components on the * mode. This will save the state of other components on the

3
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
View File

@ -2037,7 +2037,8 @@ static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)
lockdep_assert_held(&mvm->mutex); lockdep_assert_held(&mvm->mutex);
iwl_fw_cancel_timestamp(&mvm->fwrt); iwl_fw_cancel_timestamp(&mvm->fwrt);
clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status); 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_free_fw_paging(&mvm->fwrt);
iwl_fw_dump_conf_clear(&mvm->fwrt); iwl_fw_dump_conf_clear(&mvm->fwrt);
} }

3
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
View File

@ -147,9 +147,6 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
trans_pcie->is_down = true; trans_pcie->is_down = true;
/* Stop dbgc before stopping device */
iwl_fw_dbg_stop_recording(trans, NULL);
/* tell the device to stop sending interrupts */ /* tell the device to stop sending interrupts */
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);

3
drivers/net/wireless/intel/iwlwifi/pcie/trans.c
View File

@ -1242,9 +1242,6 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
trans_pcie->is_down = true; trans_pcie->is_down = true;
/* Stop dbgc before stopping device */
iwl_fw_dbg_stop_recording(trans, NULL);
/* tell the device to stop sending interrupts */ /* tell the device to stop sending interrupts */
iwl_disable_interrupts(trans); iwl_disable_interrupts(trans);