aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2014-08-24 01:02:46 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-09-03 15:33:15 -0400
commit32be1a83af63c43fddcc39c2c1aedaa486af475f (patch)
treef99093f9e79d19b2327f2843a80fd4d979aef01f
parenta2d79c5709659370cd2deeeeb8dc75bb0be5e318 (diff)
iwlwifi: mvm: fix the dump_umac_error_log
1. the base_address limitation was wrong, address can be bigger than 0x80C000 2. the ucode data_struct changed. Signed-off-by: Eran Harary <eran.harary@intel.com> Reviewed-by: Liad Kaufman <liad.kaufman@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/utils.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index ac249da8a22b..20fdca475d22 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -387,15 +387,19 @@ struct iwl_error_event_table {
387struct iwl_umac_error_event_table { 387struct iwl_umac_error_event_table {
388 u32 valid; /* (nonzero) valid, (0) log is empty */ 388 u32 valid; /* (nonzero) valid, (0) log is empty */
389 u32 error_id; /* type of error */ 389 u32 error_id; /* type of error */
390 u32 pc; /* program counter */
391 u32 blink1; /* branch link */ 390 u32 blink1; /* branch link */
392 u32 blink2; /* branch link */ 391 u32 blink2; /* branch link */
393 u32 ilink1; /* interrupt link */ 392 u32 ilink1; /* interrupt link */
394 u32 ilink2; /* interrupt link */ 393 u32 ilink2; /* interrupt link */
395 u32 data1; /* error-specific data */ 394 u32 data1; /* error-specific data */
396 u32 data2; /* error-specific data */ 395 u32 data2; /* error-specific data */
397 u32 line; /* source code line of error */ 396 u32 data3; /* error-specific data */
398 u32 umac_ver; /* umac version */ 397 u32 umac_fw_ver; /* UMAC version */
398 u32 umac_fw_api_ver; /* UMAC FW API ver */
399 u32 frame_pointer; /* core register 27*/
400 u32 stack_pointer; /* core register 28 */
401 u32 cmd_header; /* latest host cmd sent to UMAC */
402 u32 nic_isr_pref; /* ISR status register */
399} __packed; 403} __packed;
400 404
401#define ERROR_START_OFFSET (1 * sizeof(u32)) 405#define ERROR_START_OFFSET (1 * sizeof(u32))
@@ -409,7 +413,7 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
409 413
410 base = mvm->umac_error_event_table; 414 base = mvm->umac_error_event_table;
411 415
412 if (base < 0x800000 || base >= 0x80C000) { 416 if (base < 0x800000) {
413 IWL_ERR(mvm, 417 IWL_ERR(mvm,
414 "Not valid error log pointer 0x%08X for %s uCode\n", 418 "Not valid error log pointer 0x%08X for %s uCode\n",
415 base, 419 base,
@@ -428,14 +432,19 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
428 432
429 IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id, 433 IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,
430 desc_lookup(table.error_id)); 434 desc_lookup(table.error_id));
431 IWL_ERR(mvm, "0x%08X | umac uPc\n", table.pc);
432 IWL_ERR(mvm, "0x%08X | umac branchlink1\n", table.blink1); 435 IWL_ERR(mvm, "0x%08X | umac branchlink1\n", table.blink1);
433 IWL_ERR(mvm, "0x%08X | umac branchlink2\n", table.blink2); 436 IWL_ERR(mvm, "0x%08X | umac branchlink2\n", table.blink2);
434 IWL_ERR(mvm, "0x%08X | umac interruptlink1\n", table.ilink1); 437 IWL_ERR(mvm, "0x%08X | umac interruptlink1\n", table.ilink1);
435 IWL_ERR(mvm, "0x%08X | umac interruptlink2\n", table.ilink2); 438 IWL_ERR(mvm, "0x%08X | umac interruptlink2\n", table.ilink2);
436 IWL_ERR(mvm, "0x%08X | umac data1\n", table.data1); 439 IWL_ERR(mvm, "0x%08X | umac data1\n", table.data1);
437 IWL_ERR(mvm, "0x%08X | umac data2\n", table.data2); 440 IWL_ERR(mvm, "0x%08X | umac data2\n", table.data2);
438 IWL_ERR(mvm, "0x%08X | umac version\n", table.umac_ver); 441 IWL_ERR(mvm, "0x%08X | umac data3\n", table.data3);
442 IWL_ERR(mvm, "0x%08X | umac version\n", table.umac_fw_ver);
443 IWL_ERR(mvm, "0x%08X | umac api version\n", table.umac_fw_api_ver);
444 IWL_ERR(mvm, "0x%08X | frame pointer\n", table.frame_pointer);
445 IWL_ERR(mvm, "0x%08X | stack pointer\n", table.stack_pointer);
446 IWL_ERR(mvm, "0x%08X | last host cmd\n", table.cmd_header);
447 IWL_ERR(mvm, "0x%08X | isr status reg\n", table.nic_isr_pref);
439} 448}
440 449
441void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm) 450void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)