Commit 861bae42 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: avoid endless HW errors at assert time 



Curretly we only mark HW error state "after" trying to collect HW data,
but if any HW error happens while colleting HW data we go into endless
loop. avoid this by setting HW error state "before" collecting HW data.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231352.4c7e5a87da15.Ic35b2f28ff08f7ac23143c80f224d52eb97a0454@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 87f1283b

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

+6 −1
Original line number Diff line number Diff line
@@ -1298,6 +1298,12 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error) 
	} else if (mvm->fwrt.cur_fw_img == IWL_UCODE_REGULAR &&

		   mvm->hw_registered &&

		   !test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {

		/* This should be first thing before trying to collect any

		 * data to avoid endless loops if any HW error happens while

		 * collecting debug data.

		 */

		set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);



		if (mvm->fw->ucode_capa.error_log_size) {

			u32 src_size = mvm->fw->ucode_capa.error_log_size;

			u32 src_addr = mvm->fw->ucode_capa.error_log_addr;
@@ -1316,7 +1322,6 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error) 


		if (fw_error && mvm->fw_restart > 0)

			mvm->fw_restart--;

		set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);

		ieee80211_restart_hw(mvm->hw);

	}

}