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: Mordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231352.4c7e5a87da15.Ic35b2f28ff08f7ac23143c80f224d52eb97a0454@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index da55133f1a2d2f01a5f450219bbc6609eff79a1f..70b3b9797c2de06ec599fe73de54d4c4bc433ce5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -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);
        }
 }