aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
diff options
context:
space:
mode:
authorShahar S Matityahu <shahar.s.matityahu@intel.com>2019-02-10 08:59:46 -0500
committerLuca Coelho <luciano.coelho@intel.com>2019-04-03 04:19:56 -0400
commit4b1831e4897437b3b8e812cfa09784ef5d687af9 (patch)
tree26f57bbe57ce4872b84662ed7407b117416b88ed /drivers/net/wireless/intel/iwlwifi/mvm/ops.c
parent8db32fa400916333c20184793d1400bd74e1f740 (diff)
iwlwifi: dbg_ini: support HW error trigger
Differentiate between SW and HW error interrupts and support ini HW error trigger. Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/ops.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/ops.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 3cc6048d6a10..8e2e4fa7914e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1291,8 +1291,7 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
1291 * can't recover this since we're already half suspended. 1291 * can't recover this since we're already half suspended.
1292 */ 1292 */
1293 if (!mvm->fw_restart && fw_error) { 1293 if (!mvm->fw_restart && fw_error) {
1294 iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert, 1294 iwl_fw_error_collect(&mvm->fwrt);
1295 false, 0);
1296 } else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) { 1295 } else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
1297 struct iwl_mvm_reprobe *reprobe; 1296 struct iwl_mvm_reprobe *reprobe;
1298 1297
@@ -1340,8 +1339,8 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
1340 } 1339 }
1341 } 1340 }
1342 1341
1343 iwl_fw_dbg_collect_desc(&mvm->fwrt, &iwl_dump_desc_assert, 1342 iwl_fw_error_collect(&mvm->fwrt);
1344 false, 0); 1343
1345 if (fw_error && mvm->fw_restart > 0) 1344 if (fw_error && mvm->fw_restart > 0)
1346 mvm->fw_restart--; 1345 mvm->fw_restart--;
1347 set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status); 1346 set_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status);