1 files changed, 32 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index fc131867c10b..2c84ba95afca 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -209,15 +209,18 @@ TRACE_EVENT(iwlwifi_dev_tx,
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_error,
-        TP_PROTO(struct iwl_priv *priv, u32 desc, u32 time,
+        TP_PROTO(struct iwl_priv *priv, u32 desc, u32 tsf_low,
                  u32 data1, u32 data2, u32 line, u32 blink1,
-                 u32 blink2, u32 ilink1, u32 ilink2),
-        TP_ARGS(priv, desc, time, data1, data2, line,
-                blink1, blink2, ilink1, ilink2),
+                 u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
+                 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
+                 u32 brd_ver),
+        TP_ARGS(priv, desc, tsf_low, data1, data2, line,
+                blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
+                gp3, ucode_ver, hw_ver, brd_ver),
         TP_STRUCT__entry(
                 PRIV_ENTRY
                 __field(u32, desc)
-                __field(u32, time)
+                __field(u32, tsf_low)
                 __field(u32, data1)
                 __field(u32, data2)
                 __field(u32, line)
@@ -225,11 +228,18 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
                 __field(u32, blink2)
                 __field(u32, ilink1)
                 __field(u32, ilink2)
+                __field(u32, bcon_time)
+                __field(u32, gp1)
+                __field(u32, gp2)
+                __field(u32, gp3)
+                __field(u32, ucode_ver)
+                __field(u32, hw_ver)
+                __field(u32, brd_ver)
         ),
         TP_fast_assign(
                 PRIV_ASSIGN;
                 __entry->desc = desc;
-                __entry->time = time;
+                __entry->tsf_low = tsf_low;
                 __entry->data1 = data1;
                 __entry->data2 = data2;
                 __entry->line = line;
@@ -237,12 +247,25 @@ TRACE_EVENT(iwlwifi_dev_ucode_error,
                 __entry->blink2 = blink2;
                 __entry->ilink1 = ilink1;
                 __entry->ilink2 = ilink2;
+                __entry->bcon_time = bcon_time;
+                __entry->gp1 = gp1;
+                __entry->gp2 = gp2;
+                __entry->gp3 = gp3;
+                __entry->ucode_ver = ucode_ver;
+                __entry->hw_ver = hw_ver;
+                __entry->brd_ver = brd_ver;
         ),
         TP_printk("[%p] #%02d %010u data 0x%08X 0x%08X line %u, "
-                  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X",
-                  __entry->priv, __entry->desc, __entry->time, __entry->data1,
+                  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
+                  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "
+                  "hw 0x%08X brd 0x%08X",
+                  __entry->priv, __entry->desc, __entry->tsf_low,
+                  __entry->data1,
                   __entry->data2, __entry->line, __entry->blink1,
-                  __entry->blink2, __entry->ilink1, __entry->ilink2)
+                  __entry->blink2, __entry->ilink1, __entry->ilink2,
+                  __entry->bcon_time, __entry->gp1, __entry->gp2,
+                  __entry->gp3, __entry->ucode_ver, __entry->hw_ver,
+                  __entry->brd_ver)
 );
 
 TRACE_EVENT(iwlwifi_dev_ucode_event,