Commit e1dfc085 authored by Gregory Greenman's avatar Gregory Greenman Committed by John W. Linville
Browse files

iwlwifi: use uCode error and event tables pointer w.r.t loaded image 



This patch updates the usage of the pointers to error and log tables
received in alive response w.r.t. the current uCode image.

Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 87283cc1

drivers/net/wireless/iwlwifi/iwl-core.c

+19 −10
Original line number Diff line number Diff line
@@ -1084,8 +1084,11 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv) 
	u32 data2, line;

	u32 desc, time, count, base, data1;

	u32 blink1, blink2, ilink1, ilink2;

	int rc;

	int ret;



	if (priv->ucode_type == UCODE_INIT)

		base = le32_to_cpu(priv->card_alive_init.error_event_table_ptr);

	else

		base = le32_to_cpu(priv->card_alive.error_event_table_ptr);



	if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
@@ -1093,8 +1096,8 @@ void iwl_dump_nic_error_log(struct iwl_priv *priv) 
		return;

	}



	rc = iwl_grab_nic_access(priv);

	if (rc) {

	ret = iwl_grab_nic_access(priv);

	if (ret) {

		IWL_WARNING("Can not read from adapter at this time.\n");

		return;

	}
@@ -1146,7 +1149,9 @@ void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 


	if (num_events == 0)

		return;



	if (priv->ucode_type == UCODE_INIT)

		base = le32_to_cpu(priv->card_alive_init.log_event_table_ptr);

	else

		base = le32_to_cpu(priv->card_alive.log_event_table_ptr);



	if (mode == 0)
@@ -1177,7 +1182,7 @@ EXPORT_SYMBOL(iwl_print_event_log); 


void iwl_dump_nic_event_log(struct iwl_priv *priv)

{

	int rc;

	int ret;

	u32 base;       /* SRAM byte address of event log header */

	u32 capacity;   /* event log capacity in # entries */

	u32 mode;       /* 0 - no timestamp, 1 - timestamp recorded */
@@ -1185,14 +1190,18 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv) 
	u32 next_entry; /* index of next entry to be written by uCode */

	u32 size;       /* # entries that we'll print */



	if (priv->ucode_type == UCODE_INIT)

		base = le32_to_cpu(priv->card_alive_init.log_event_table_ptr);

	else

		base = le32_to_cpu(priv->card_alive.log_event_table_ptr);



	if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {

		IWL_ERROR("Invalid event log pointer 0x%08X\n", base);

		return;

	}



	rc = iwl_grab_nic_access(priv);

	if (rc) {

	ret = iwl_grab_nic_access(priv);

	if (ret) {

		IWL_WARNING("Can not read from adapter at this time.\n");

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE