ath10k: remove tsf argument from rx_desc tracing
[cascardo/linux.git] / drivers / net / wireless / ath / ath10k / trace.h
index 4eb2ecb..2409cb5 100644 (file)
@@ -18,6 +18,7 @@
 #if !defined(_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
 
 #include <linux/tracepoint.h>
+#include "core.h"
 
 #define _TRACE_H_
 
@@ -39,59 +40,79 @@ static inline void trace_ ## name(proto) {}
 #define ATH10K_MSG_MAX 200
 
 DECLARE_EVENT_CLASS(ath10k_log_event,
-       TP_PROTO(struct va_format *vaf),
-       TP_ARGS(vaf),
+       TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+       TP_ARGS(ar, vaf),
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __dynamic_array(char, msg, ATH10K_MSG_MAX)
        ),
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
                                       ATH10K_MSG_MAX,
                                       vaf->fmt,
                                       *vaf->va) >= ATH10K_MSG_MAX);
        ),
-       TP_printk("%s", __get_str(msg))
+       TP_printk(
+               "%s %s %s",
+               __get_str(driver),
+               __get_str(device),
+               __get_str(msg)
+       )
 );
 
 DEFINE_EVENT(ath10k_log_event, ath10k_log_err,
-            TP_PROTO(struct va_format *vaf),
-            TP_ARGS(vaf)
+            TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+            TP_ARGS(ar, vaf)
 );
 
 DEFINE_EVENT(ath10k_log_event, ath10k_log_warn,
-            TP_PROTO(struct va_format *vaf),
-            TP_ARGS(vaf)
+            TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+            TP_ARGS(ar, vaf)
 );
 
 DEFINE_EVENT(ath10k_log_event, ath10k_log_info,
-            TP_PROTO(struct va_format *vaf),
-            TP_ARGS(vaf)
+            TP_PROTO(struct ath10k *ar, struct va_format *vaf),
+            TP_ARGS(ar, vaf)
 );
 
 TRACE_EVENT(ath10k_log_dbg,
-       TP_PROTO(unsigned int level, struct va_format *vaf),
-       TP_ARGS(level, vaf),
+       TP_PROTO(struct ath10k *ar, unsigned int level, struct va_format *vaf),
+       TP_ARGS(ar, level, vaf),
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __field(unsigned int, level)
                __dynamic_array(char, msg, ATH10K_MSG_MAX)
        ),
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                __entry->level = level;
                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
                                       ATH10K_MSG_MAX,
                                       vaf->fmt,
                                       *vaf->va) >= ATH10K_MSG_MAX);
        ),
-       TP_printk("%s", __get_str(msg))
+       TP_printk(
+               "%s %s %s",
+               __get_str(driver),
+               __get_str(device),
+               __get_str(msg)
+       )
 );
 
 TRACE_EVENT(ath10k_log_dbg_dump,
-       TP_PROTO(const char *msg, const char *prefix,
+       TP_PROTO(struct ath10k *ar, const char *msg, const char *prefix,
                 const void *buf, size_t buf_len),
 
-       TP_ARGS(msg, prefix, buf, buf_len),
+       TP_ARGS(ar, msg, prefix, buf, buf_len),
 
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __string(msg, msg)
                __string(prefix, prefix)
                __field(size_t, buf_len)
@@ -99,6 +120,8 @@ TRACE_EVENT(ath10k_log_dbg_dump,
        ),
 
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                __assign_str(msg, msg);
                __assign_str(prefix, prefix);
                __entry->buf_len = buf_len;
@@ -106,16 +129,22 @@ TRACE_EVENT(ath10k_log_dbg_dump,
        ),
 
        TP_printk(
-               "%s/%s\n", __get_str(prefix), __get_str(msg)
+               "%s %s %s/%s\n",
+               __get_str(driver),
+               __get_str(device),
+               __get_str(prefix),
+               __get_str(msg)
        )
 );
 
 TRACE_EVENT(ath10k_wmi_cmd,
-       TP_PROTO(int id, void *buf, size_t buf_len, int ret),
+       TP_PROTO(struct ath10k *ar, int id, void *buf, size_t buf_len, int ret),
 
-       TP_ARGS(id, buf, buf_len, ret),
+       TP_ARGS(ar, id, buf, buf_len, ret),
 
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __field(unsigned int, id)
                __field(size_t, buf_len)
                __dynamic_array(u8, buf, buf_len)
@@ -123,6 +152,8 @@ TRACE_EVENT(ath10k_wmi_cmd,
        ),
 
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                __entry->id = id;
                __entry->buf_len = buf_len;
                __entry->ret = ret;
@@ -130,7 +161,9 @@ TRACE_EVENT(ath10k_wmi_cmd,
        ),
 
        TP_printk(
-               "id %d len %zu ret %d",
+               "%s %s id %d len %zu ret %d",
+               __get_str(driver),
+               __get_str(device),
                __entry->id,
                __entry->buf_len,
                __entry->ret
@@ -138,71 +171,249 @@ TRACE_EVENT(ath10k_wmi_cmd,
 );
 
 TRACE_EVENT(ath10k_wmi_event,
-       TP_PROTO(int id, void *buf, size_t buf_len),
+       TP_PROTO(struct ath10k *ar, int id, void *buf, size_t buf_len),
 
-       TP_ARGS(id, buf, buf_len),
+       TP_ARGS(ar, id, buf, buf_len),
 
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __field(unsigned int, id)
                __field(size_t, buf_len)
                __dynamic_array(u8, buf, buf_len)
        ),
 
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                __entry->id = id;
                __entry->buf_len = buf_len;
                memcpy(__get_dynamic_array(buf), buf, buf_len);
        ),
 
        TP_printk(
-               "id %d len %zu",
+               "%s %s id %d len %zu",
+               __get_str(driver),
+               __get_str(device),
                __entry->id,
                __entry->buf_len
        )
 );
 
 TRACE_EVENT(ath10k_htt_stats,
-       TP_PROTO(void *buf, size_t buf_len),
+       TP_PROTO(struct ath10k *ar, void *buf, size_t buf_len),
 
-       TP_ARGS(buf, buf_len),
+       TP_ARGS(ar, buf, buf_len),
 
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __field(size_t, buf_len)
                __dynamic_array(u8, buf, buf_len)
        ),
 
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                __entry->buf_len = buf_len;
                memcpy(__get_dynamic_array(buf), buf, buf_len);
        ),
 
        TP_printk(
-               "len %zu",
+               "%s %s len %zu",
+               __get_str(driver),
+               __get_str(device),
                __entry->buf_len
        )
 );
 
 TRACE_EVENT(ath10k_wmi_dbglog,
-       TP_PROTO(void *buf, size_t buf_len),
+       TP_PROTO(struct ath10k *ar, void *buf, size_t buf_len),
 
-       TP_ARGS(buf, buf_len),
+       TP_ARGS(ar, buf, buf_len),
 
        TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
                __field(size_t, buf_len)
                __dynamic_array(u8, buf, buf_len)
        ),
 
        TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
                __entry->buf_len = buf_len;
                memcpy(__get_dynamic_array(buf), buf, buf_len);
        ),
 
        TP_printk(
-               "len %zu",
+               "%s %s len %zu",
+               __get_str(driver),
+               __get_str(device),
                __entry->buf_len
        )
 );
 
+TRACE_EVENT(ath10k_htt_pktlog,
+           TP_PROTO(struct ath10k *ar, void *buf, u16 buf_len),
+
+       TP_ARGS(ar, buf, buf_len),
+
+       TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
+               __field(u16, buf_len)
+               __dynamic_array(u8, pktlog, buf_len)
+       ),
+
+       TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
+               __entry->buf_len = buf_len;
+               memcpy(__get_dynamic_array(pktlog), buf, buf_len);
+       ),
+
+       TP_printk(
+               "%s %s size %hu",
+               __get_str(driver),
+               __get_str(device),
+               __entry->buf_len
+        )
+);
+
+TRACE_EVENT(ath10k_htt_rx_desc,
+           TP_PROTO(struct ath10k *ar, void *rxdesc, u16 len),
+
+       TP_ARGS(ar, rxdesc, len),
+
+       TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
+               __field(u16, len)
+               __dynamic_array(u8, rxdesc, len)
+       ),
+
+       TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
+               __entry->len = len;
+               memcpy(__get_dynamic_array(rxdesc), rxdesc, len);
+       ),
+
+       TP_printk(
+               "%s %s len %hu",
+               __get_str(driver),
+               __get_str(device),
+               __entry->len
+        )
+);
+
+TRACE_EVENT(ath10k_htt_tx,
+           TP_PROTO(struct ath10k *ar, u16 msdu_id, u16 msdu_len,
+                    u8 vdev_id, u8 tid),
+
+       TP_ARGS(ar, msdu_id, msdu_len, vdev_id, tid),
+
+       TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
+               __field(u16, msdu_id)
+               __field(u16, msdu_len)
+               __field(u8, vdev_id)
+               __field(u8, tid)
+       ),
+
+       TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
+               __entry->msdu_id = msdu_id;
+               __entry->msdu_len = msdu_len;
+               __entry->vdev_id = vdev_id;
+               __entry->tid = tid;
+       ),
+
+       TP_printk(
+               "%s %s msdu_id %d msdu_len %d vdev_id %d tid %d",
+               __get_str(driver),
+               __get_str(device),
+               __entry->msdu_id,
+               __entry->msdu_len,
+               __entry->vdev_id,
+               __entry->tid
+        )
+);
+
+TRACE_EVENT(ath10k_txrx_tx_unref,
+           TP_PROTO(struct ath10k *ar, u16 msdu_id),
+
+       TP_ARGS(ar, msdu_id),
+
+       TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
+               __field(u16, msdu_id)
+       ),
+
+       TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
+               __entry->msdu_id = msdu_id;
+       ),
+
+       TP_printk(
+               "%s %s msdu_id %d",
+               __get_str(driver),
+               __get_str(device),
+               __entry->msdu_id
+        )
+);
+
+DECLARE_EVENT_CLASS(ath10k_data_event,
+                   TP_PROTO(struct ath10k *ar, void *data, size_t len),
+
+       TP_ARGS(ar, data, len),
+
+       TP_STRUCT__entry(
+               __string(device, dev_name(ar->dev))
+               __string(driver, dev_driver_string(ar->dev))
+               __field(size_t, len)
+               __dynamic_array(u8, data, len)
+       ),
+
+       TP_fast_assign(
+               __assign_str(device, dev_name(ar->dev));
+               __assign_str(driver, dev_driver_string(ar->dev));
+               __entry->len = len;
+               memcpy(__get_dynamic_array(data), data, len);
+       ),
+
+       TP_printk(
+               "%s %s len %zu\n",
+               __get_str(driver),
+               __get_str(device),
+               __entry->len
+       )
+);
+
+DEFINE_EVENT(ath10k_data_event, ath10k_htt_tx_msdu,
+            TP_PROTO(struct ath10k *ar, void *data, size_t len),
+            TP_ARGS(ar, data, len)
+);
+
+DEFINE_EVENT(ath10k_data_event, ath10k_htt_rx_pop_msdu,
+            TP_PROTO(struct ath10k *ar, void *data, size_t len),
+            TP_ARGS(ar, data, len)
+);
+
+DEFINE_EVENT(ath10k_data_event, ath10k_wmi_mgmt_tx,
+            TP_PROTO(struct ath10k *ar, void *data, size_t len),
+            TP_ARGS(ar, data, len)
+);
+
+DEFINE_EVENT(ath10k_data_event, ath10k_wmi_bcn_tx,
+            TP_PROTO(struct ath10k *ar, void *data, size_t len),
+            TP_ARGS(ar, data, len)
+);
 #endif /* _TRACE_H_ || TRACE_HEADER_MULTI_READ*/
 
 /* we don't want to use include/trace/events */