1 files changed, 17 insertions, 6 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index ac249da8a22b..1958f298ac8b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -6,6 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -31,6 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -387,15 +389,19 @@ struct iwl_error_event_table {
 struct iwl_umac_error_event_table {
         u32 valid;              /* (nonzero) valid, (0) log is empty */
         u32 error_id;           /* type of error */
-        u32 pc;                 /* program counter */
         u32 blink1;             /* branch link */
         u32 blink2;             /* branch link */
         u32 ilink1;             /* interrupt link */
         u32 ilink2;             /* interrupt link */
         u32 data1;              /* error-specific data */
         u32 data2;              /* error-specific data */
-        u32 line;               /* source code line of error */
-        u32 umac_ver;           /* umac version */
+        u32 data3;              /* error-specific data */
+        u32 umac_fw_ver;        /* UMAC version */
+        u32 umac_fw_api_ver;    /* UMAC FW API ver */
+        u32 frame_pointer;      /* core register 27*/
+        u32 stack_pointer;      /* core register 28 */
+        u32 cmd_header; /* latest host cmd sent to UMAC */
+        u32 nic_isr_pref;       /* ISR status register */
 } __packed;
 
 #define ERROR_START_OFFSET  (1 * sizeof(u32))
@@ -409,7 +415,7 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
 
         base = mvm->umac_error_event_table;
 
-        if (base < 0x800000 || base >= 0x80C000) {
+        if (base < 0x800000) {
                 IWL_ERR(mvm,
                         "Not valid error log pointer 0x%08X for %s uCode\n",
                         base,
@@ -428,14 +434,19 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
 
         IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,
                 desc_lookup(table.error_id));
-        IWL_ERR(mvm, "0x%08X | umac uPc\n", table.pc);
         IWL_ERR(mvm, "0x%08X | umac branchlink1\n", table.blink1);
         IWL_ERR(mvm, "0x%08X | umac branchlink2\n", table.blink2);
         IWL_ERR(mvm, "0x%08X | umac interruptlink1\n", table.ilink1);
         IWL_ERR(mvm, "0x%08X | umac interruptlink2\n", table.ilink2);
         IWL_ERR(mvm, "0x%08X | umac data1\n", table.data1);
         IWL_ERR(mvm, "0x%08X | umac data2\n", table.data2);
-        IWL_ERR(mvm, "0x%08X | umac version\n", table.umac_ver);
+        IWL_ERR(mvm, "0x%08X | umac data3\n", table.data3);
+        IWL_ERR(mvm, "0x%08X | umac version\n", table.umac_fw_ver);
+        IWL_ERR(mvm, "0x%08X | umac api version\n", table.umac_fw_api_ver);
+        IWL_ERR(mvm, "0x%08X | frame pointer\n", table.frame_pointer);
+        IWL_ERR(mvm, "0x%08X | stack pointer\n", table.stack_pointer);
+        IWL_ERR(mvm, "0x%08X | last host cmd\n", table.cmd_header);
+        IWL_ERR(mvm, "0x%08X | isr status reg\n", table.nic_isr_pref);
 }
 
 void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)