Commit 6c7f7087 authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: dbg: debug recording stop and restart command remove 



The 0xF6 command used to start and stop the recording from 22560 devices
was removed. This is causing an assert when the driver tries to alter
the recording state.
Remove the use of the command.

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent c040fe83

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

+1 −1
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx) 
		goto out;

	}



	iwl_fw_dbg_stop_recording(fwrt, &params);

	iwl_fw_dbg_stop_recording(fwrt->trans, &params);



	IWL_DEBUG_FW_INFO(fwrt, "WRT: data collection start\n");

	if (fwrt->trans->dbg.ini_valid)

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

+18 −29
Original line number Diff line number Diff line
@@ -263,23 +263,6 @@ _iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt, 
					iwl_fw_dbg_get_trigger((fwrt)->fw,\

							       (trig)))



static inline int

iwl_fw_dbg_start_stop_hcmd(struct iwl_fw_runtime *fwrt, bool start)

{

	struct iwl_ldbg_config_cmd cmd = {

		.type = start ? cpu_to_le32(START_DEBUG_RECORDING) :

				cpu_to_le32(STOP_DEBUG_RECORDING),

	};

	struct iwl_host_cmd hcmd = {

		.id = LDBG_CONFIG_CMD,

		.flags = CMD_ASYNC,

		.data[0] = &cmd,

		.len[0] = sizeof(cmd),

	};



	return iwl_trans_send_cmd(fwrt->trans, &hcmd);

}



static inline void

_iwl_fw_dbg_stop_recording(struct iwl_trans *trans,

			   struct iwl_fw_dbg_params *params)
@@ -306,21 +289,24 @@ _iwl_fw_dbg_stop_recording(struct iwl_trans *trans, 
}



static inline void

iwl_fw_dbg_stop_recording(struct iwl_fw_runtime *fwrt,

iwl_fw_dbg_stop_recording(struct iwl_trans *trans,

			  struct iwl_fw_dbg_params *params)

{

	/* if the FW crashed or not debug monitor cfg was given, there is

	 * no point in stopping

	 */

	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status) ||

	    (!fwrt->trans->dbg.dest_tlv &&

	     fwrt->trans->dbg.ini_dest == IWL_FW_INI_LOCATION_INVALID))

	if (test_bit(STATUS_FW_ERROR, &trans->status) ||

	    (!trans->dbg.dest_tlv &&

	     trans->dbg.ini_dest == IWL_FW_INI_LOCATION_INVALID))

		return;



	if (fwrt->trans->cfg->device_family < IWL_DEVICE_FAMILY_22560)

		_iwl_fw_dbg_stop_recording(fwrt->trans, params);

	else

		iwl_fw_dbg_start_stop_hcmd(fwrt, false);

	if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560) {

		IWL_ERR(trans,

			"WRT: unsupported device family %d for debug stop recording\n",

			trans->cfg->device_family);

		return;

	}

	_iwl_fw_dbg_stop_recording(trans, params);

}



static inline void
@@ -362,10 +348,13 @@ iwl_fw_dbg_restart_recording(struct iwl_fw_runtime *fwrt, 
	     fwrt->trans->dbg.ini_dest == IWL_FW_INI_LOCATION_INVALID))

		return;



	if (fwrt->trans->cfg->device_family < IWL_DEVICE_FAMILY_22560)

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

		IWL_ERR(fwrt,

			"WRT: unsupported device family %d for debug restart recording\n",

			fwrt->trans->cfg->device_family);

		return;

	}

	_iwl_fw_dbg_restart_recording(fwrt->trans, params);

	else

		iwl_fw_dbg_start_stop_hcmd(fwrt, true);

#ifdef CONFIG_IWLWIFI_DEBUGFS

	iwl_fw_set_dbg_rec_on(fwrt);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 
	 * recording automatically.

	 */

	if (mvm->trans->cfg->device_family < IWL_DEVICE_FAMILY_9000)

		_iwl_fw_dbg_stop_recording(mvm->trans, NULL);

		iwl_fw_dbg_stop_recording(mvm->trans, NULL);



	/* must be last -- this switches firmware state */

	ret = iwl_mvm_send_cmd(mvm, &d3_cfg_cmd);

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power) 
	trans_pcie->is_down = true;



	/* Stop dbgc before stopping device */

	_iwl_fw_dbg_stop_recording(trans, NULL);

	iwl_fw_dbg_stop_recording(trans, NULL);



	/* tell the device to stop sending interrupts */

	iwl_disable_interrupts(trans);

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+1 −1
Original line number Diff line number Diff line
@@ -1243,7 +1243,7 @@ static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power) 
	trans_pcie->is_down = true;



	/* Stop dbgc before stopping device */

	_iwl_fw_dbg_stop_recording(trans, NULL);

	iwl_fw_dbg_stop_recording(trans, NULL);



	/* tell the device to stop sending interrupts */

	iwl_disable_interrupts(trans);

CRA Git | Maintained and supported by SUSTech CRA and CCSE