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

iwlwifi: dbg: allow dump collection in case of an early error 



Improve the robustness of the dump collection flow in case of an early
error:
1. in iwl_trans_pcie_sync_nmi, disable and enable interrupts only if
   they were already enabled
2. attempt to initiate dump collection in iwl_fw_dbg_error_collect only
   if the device is enabled
3. check Tx command queue was already allocated before trying to collect it

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

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

+5 −2
Original line number Diff line number Diff line
@@ -2057,9 +2057,12 @@ int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt, 
			     enum iwl_fw_dbg_trigger trig_type)

{

	int ret;

	struct iwl_fw_dump_desc *iwl_dump_error_desc =

		kmalloc(sizeof(*iwl_dump_error_desc), GFP_KERNEL);

	struct iwl_fw_dump_desc *iwl_dump_error_desc;



	if (!test_bit(STATUS_DEVICE_ENABLED, &fwrt->trans->status))

		return -EIO;



	iwl_dump_error_desc = kmalloc(sizeof(*iwl_dump_error_desc), GFP_KERNEL);

	if (!iwl_dump_error_desc)

		return -ENOMEM;

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

+17 −4
Original line number Diff line number Diff line
@@ -3192,7 +3192,7 @@ static struct iwl_trans_dump_data 
	len = sizeof(*dump_data);



	/* host commands */

	if (dump_mask & BIT(IWL_FW_ERROR_DUMP_TXCMD))

	if (dump_mask & BIT(IWL_FW_ERROR_DUMP_TXCMD) && cmdq)

		len += sizeof(*data) +

			cmdq->n_window * (sizeof(*txcmd) +

					  TFD_MAX_PAYLOAD_SIZE);
@@ -3244,7 +3244,7 @@ static struct iwl_trans_dump_data 
	len = 0;

	data = (void *)dump_data->data;



	if (dump_mask & BIT(IWL_FW_ERROR_DUMP_TXCMD)) {

	if (dump_mask & BIT(IWL_FW_ERROR_DUMP_TXCMD) && cmdq) {

		u16 tfd_size = trans_pcie->tfd_size;



		data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_TXCMD);
@@ -3681,6 +3681,7 @@ void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans) 
{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	unsigned long timeout = jiffies + IWL_TRANS_NMI_TIMEOUT;

	bool interrupts_enabled = test_bit(STATUS_INT_ENABLED, &trans->status);

	u32 inta_addr, sw_err_bit;



	if (trans_pcie->msix_enabled) {
@@ -3691,7 +3692,12 @@ void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans) 
		sw_err_bit = CSR_INT_BIT_SW_ERR;

	}



	/* if the interrupts were already disabled, there is no point in

	 * calling iwl_disable_interrupts

	 */

	if (interrupts_enabled)

		iwl_disable_interrupts(trans);



	iwl_force_nmi(trans);

	while (time_after(timeout, jiffies)) {

		u32 inta_hw = iwl_read32(trans, inta_addr);
@@ -3705,6 +3711,13 @@ void iwl_trans_pcie_sync_nmi(struct iwl_trans *trans) 


		mdelay(1);

	}



	/* enable interrupts only if there were already enabled before this

	 * function to avoid a case were the driver enable interrupts before

	 * proper configurations were made

	 */

	if (interrupts_enabled)

		iwl_enable_interrupts(trans);



	iwl_trans_fw_error(trans);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE