Skip to content

Commit eb29b4f

Browse files
committed
wifi: iwlwifi: fix debug actions order
The order of actions taken for debug was implemented incorrectly. Now we implemented the dump split and do the FW reset only in the middle of the dump (rather than the FW killing itself on error.) As a result, some of the actions taken when applying the config will now crash the device, so we need to fix the order. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://patch.msgid.link/20250308231427.6de7fa8e63ed.I40632c48e2a67a8aca05def572a934b88ce7934b@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 5f0ab2f commit eb29b4f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
/*
3-
* Copyright (C) 2018-2024 Intel Corporation
3+
* Copyright (C) 2018-2025 Intel Corporation
44
*/
55
#include <linux/firmware.h>
66
#include "iwl-drv.h"
@@ -1372,15 +1372,15 @@ void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,
13721372
switch (tp_id) {
13731373
case IWL_FW_INI_TIME_POINT_EARLY:
13741374
iwl_dbg_tlv_init_cfg(fwrt);
1375-
iwl_dbg_tlv_apply_config(fwrt, conf_list);
13761375
iwl_dbg_tlv_update_drams(fwrt);
13771376
iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL);
1377+
iwl_dbg_tlv_apply_config(fwrt, conf_list);
13781378
break;
13791379
case IWL_FW_INI_TIME_POINT_AFTER_ALIVE:
13801380
iwl_dbg_tlv_apply_buffers(fwrt);
13811381
iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list);
1382-
iwl_dbg_tlv_apply_config(fwrt, conf_list);
13831382
iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL);
1383+
iwl_dbg_tlv_apply_config(fwrt, conf_list);
13841384
break;
13851385
case IWL_FW_INI_TIME_POINT_PERIODIC:
13861386
iwl_dbg_tlv_set_periodic_trigs(fwrt);
@@ -1390,14 +1390,14 @@ void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,
13901390
case IWL_FW_INI_TIME_POINT_MISSED_BEACONS:
13911391
case IWL_FW_INI_TIME_POINT_FW_DHC_NOTIFICATION:
13921392
iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list);
1393-
iwl_dbg_tlv_apply_config(fwrt, conf_list);
13941393
iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data,
13951394
iwl_dbg_tlv_check_fw_pkt);
1395+
iwl_dbg_tlv_apply_config(fwrt, conf_list);
13961396
break;
13971397
default:
13981398
iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list);
1399-
iwl_dbg_tlv_apply_config(fwrt, conf_list);
14001399
iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL);
1400+
iwl_dbg_tlv_apply_config(fwrt, conf_list);
14011401
break;
14021402
}
14031403
}

0 commit comments

Comments
 (0)