Commit fb5b2846 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: move umac_error_event_table validity check to where it's set 



There's no point in checking the validity of the
umac_error_event_table pointer every time we generate a dump.  It's
cleaner to do so when we read the value, namely when we receive the
alive data.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 0e1be40a

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

+11 −2
Original line number Diff line number Diff line
@@ -200,10 +200,19 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait, 


	mvm->umac_error_event_table = le32_to_cpu(umac->error_info_addr);



	if (mvm->umac_error_event_table <

	    (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_A000 ?

	     0x400000 : 0x800000))

		IWL_ERR(mvm,

			"Not valid error log pointer 0x%08X for %s uCode\n",

			mvm->umac_error_event_table,

			(mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) ?

			"Init" : "RT");

	else

		mvm->support_umac_log = true;



	alive_data->scd_base_addr = le32_to_cpu(lmac1->scd_base_ptr);

	alive_data->valid = status == IWL_ALIVE_STATUS_OK;

	if (mvm->umac_error_event_table)

		mvm->support_umac_log = true;



	IWL_DEBUG_FW(mvm,

		     "Alive ucode status 0x%04x revision 0x%01X 0x%01X\n",

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

+4 −14
Original line number Diff line number Diff line
@@ -455,21 +455,12 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm) 
{

	struct iwl_trans *trans = mvm->trans;

	struct iwl_umac_error_event_table table;

	u32 base;



	base = mvm->umac_error_event_table;



	if (base < (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_A000 ?

		    0x400000 : 0x800000)) {

		IWL_ERR(mvm,

			"Not valid error log pointer 0x%08X for %s uCode\n",

			base,

			(mvm->fwrt.cur_fw_img == IWL_UCODE_INIT)

			? "Init" : "RT");

	if (!mvm->support_umac_log)

		return;

	}



	iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));

	iwl_trans_read_mem_bytes(trans, mvm->umac_error_event_table, &table,

				 sizeof(table));



	if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {

		IWL_ERR(trans, "Start IWL Error Log Dump:\n");
@@ -609,7 +600,6 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm) 
	if (mvm->error_event_table[1])

		iwl_mvm_dump_lmac_error_log(mvm, mvm->error_event_table[1]);



	if (mvm->support_umac_log)

	iwl_mvm_dump_umac_error_log(mvm);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE