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

Commit 4b7f7ee2 authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Luca Coelho
Browse files

iwlwifi: align timestamp cancel with timestamp start 



Canceling the periodic timestamp work should be
done in the opposite flow to where it was started.
This also prevents from sending the MARKER command
during the mac_stop flow - causing a false queue hang
(FW is no longer there to send a response).

Fixes: 93b167c1 ("iwlwifi: runtime: sync FW and host clocks for logs")
Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 4437ba7e

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

+0 −6
Original line number Diff line number Diff line
@@ -76,9 +76,3 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, 
	iwl_fwrt_dbgfs_register(fwrt, dbgfs_dir);

}

IWL_EXPORT_SYMBOL(iwl_fw_runtime_init);
 


void iwl_fw_runtime_exit(struct iwl_fw_runtime *fwrt)

{

	iwl_fw_cancel_timestamp(fwrt);

}

IWL_EXPORT_SYMBOL(iwl_fw_runtime_exit);

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#include "fw/runtime.h"

#include "fw/dbg.h"

#include "fw/acpi.h"

#include "fw/debugfs.h"



#define IWL_MVM_MAX_ADDRESSES		5

/* RSSI offset for WkP */
@@ -1783,6 +1784,7 @@ static inline u32 iwl_mvm_flushable_queues(struct iwl_mvm *mvm) 


static inline void iwl_mvm_stop_device(struct iwl_mvm *mvm)

{

	iwl_fw_cancel_timestamp(&mvm->fwrt);

	iwl_free_fw_paging(&mvm->fwrt);

	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);

	iwl_fw_dump_conf_clear(&mvm->fwrt);

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

+0 −2
Original line number Diff line number Diff line
@@ -802,7 +802,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	iwl_mvm_leds_exit(mvm);

	iwl_mvm_thermal_exit(mvm);

 out_free:

	iwl_fw_runtime_exit(&mvm->fwrt);

	iwl_fw_flush_dump(&mvm->fwrt);



	if (iwlmvm_mod_params.init_dbg)
@@ -843,7 +842,6 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode) 
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_IWLWIFI_DEBUGFS)

	kfree(mvm->d3_resume_sram);

#endif

	iwl_fw_runtime_exit(&mvm->fwrt);

	iwl_trans_op_mode_leave(mvm->trans);



	iwl_phy_db_free(mvm->phy_db);