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

Commit 1efc3843 authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: stop dbgc recording before stopping DMA 



Today we stop the device and the DMA without stopping the dbgc
recording before. This causes host crashes when the DMA
rate is high.

Stop dbgc recording when clearing the fw debug configuration
to fix this.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent baf41bc3

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

+2 −5
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work) 


	if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_7000) {

		/* stop recording */

		iwl_set_bits_prph(fwrt->trans, MON_BUFF_SAMPLE_CTL, 0x100);

		iwl_fw_dbg_stop_recording(fwrt);



		iwl_fw_error_dump(fwrt);
@@ -1104,10 +1104,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work) 
		u32 in_sample = iwl_read_prph(fwrt->trans, DBGC_IN_SAMPLE);

		u32 out_ctrl = iwl_read_prph(fwrt->trans, DBGC_OUT_CTRL);



		/* stop recording */

		iwl_write_prph(fwrt->trans, DBGC_IN_SAMPLE, 0);

		udelay(100);

		iwl_write_prph(fwrt->trans, DBGC_OUT_CTRL, 0);

		iwl_fw_dbg_stop_recording(fwrt);

		/* wait before we collect the data till the DBGC stop */

		udelay(500);

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

+15 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#include <linux/workqueue.h>

#include <net/cfg80211.h>

#include "runtime.h"

#include "iwl-prph.h"

#include "iwl-io.h"

#include "file.h"

#include "error-dump.h"
@@ -194,8 +196,21 @@ _iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt, 
					iwl_fw_dbg_get_trigger((fwrt)->fw,\

							       (trig)))



static inline void iwl_fw_dbg_stop_recording(struct iwl_fw_runtime *fwrt)

{

	if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_7000) {

		iwl_set_bits_prph(fwrt->trans, MON_BUFF_SAMPLE_CTL, 0x100);

	} else {

		iwl_write_prph(fwrt->trans, DBGC_IN_SAMPLE, 0);

		udelay(100);

		iwl_write_prph(fwrt->trans, DBGC_OUT_CTRL, 0);

	}

}



static inline void iwl_fw_dump_conf_clear(struct iwl_fw_runtime *fwrt)

{

	iwl_fw_dbg_stop_recording(fwrt);



	fwrt->dump.conf = FW_DBG_INVALID;

}