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

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

iwlwifi: dbg: remove iwl_fw_cancel_dumps function 



Use cancel_delayed_work_sync on the dump workers only in case of
unloading the op mode. In any other case use iwl_fw_flush_dumps or
iwl_fw_dbg_stop_sync (depends if the op mode mutex is held or not).
This way, the driver will wait until debug data is collected in all
cases but op mode unloading.

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

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

+0 −11
Original line number Diff line number Diff line
@@ -321,17 +321,6 @@ static inline void iwl_fw_flush_dumps(struct iwl_fw_runtime *fwrt) 
	}

}



static inline void iwl_fw_cancel_dumps(struct iwl_fw_runtime *fwrt)

{

	int i;



	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;

	}

}



#ifdef CONFIG_IWLWIFI_DEBUGFS

static inline void iwl_fw_cancel_timestamp(struct iwl_fw_runtime *fwrt)

{

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

+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@ static inline void iwl_fw_runtime_free(struct iwl_fw_runtime *fwrt) 
		kfree(active->trig);

		active->trig = NULL;

	}



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

}



void iwl_fw_runtime_suspend(struct iwl_fw_runtime *fwrt);

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

+0 −1
Original line number Diff line number Diff line
@@ -1243,7 +1243,6 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw) 
	 */

	clear_bit(IWL_MVM_STATUS_FIRMWARE_RUNNING, &mvm->status);



	iwl_fw_cancel_dumps(&mvm->fwrt);

	cancel_delayed_work_sync(&mvm->cs_tx_unblock_dwork);

	cancel_delayed_work_sync(&mvm->scan_timeout_dwork);

	iwl_fw_free_dump_desc(&mvm->fwrt);