ALSA: firewire_lib: add tracepoints for packets without CIP headers

[mirror_ubuntu-bionic-kernel.git] / sound / firewire / amdtp-stream-trace.h

diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index 9c04faf206b287e5f949120f5fa2860a5690964b..ea0d486652c838cb08a424eed7d347315bceda42 100644 (file)
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -14,8 +14,8 @@
 #include <linux/tracepoint.h>
 
 TRACE_EVENT(in_packet,
-       TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 cip_header[2], unsigned int payload_quadlets, unsigned int index),
-       TP_ARGS(s, cycles, cip_header, payload_quadlets, index),
+       TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 cip_header[2], unsigned int payload_length, unsigned int index),
+       TP_ARGS(s, cycles, cip_header, payload_length, index),
        TP_STRUCT__entry(
                __field(unsigned int, second)
                __field(unsigned int, cycle)
@@ -37,7 +37,7 @@ TRACE_EVENT(in_packet,
                __entry->dest = fw_parent_device(s->unit)->card->node_id;
                __entry->cip_header0 = cip_header[0];
                __entry->cip_header1 = cip_header[1];
-               __entry->payload_quadlets = payload_quadlets;
+               __entry->payload_quadlets = payload_length / 4;
                __entry->packet_index = s->packet_index;
                __entry->irq = !!in_interrupt();
                __entry->index = index;
@@ -101,6 +101,94 @@ TRACE_EVENT(out_packet,
                __entry->index)
 );
 
+TRACE_EVENT(in_packet_without_header,
+       TP_PROTO(const struct amdtp_stream *s, u32 cycles, unsigned int payload_quadlets, unsigned int data_blocks, unsigned int index),
+       TP_ARGS(s, cycles, payload_quadlets, data_blocks, index),
+       TP_STRUCT__entry(
+               __field(unsigned int, second)
+               __field(unsigned int, cycle)
+               __field(int, channel)
+               __field(int, src)
+               __field(int, dest)
+               __field(unsigned int, payload_quadlets)
+               __field(unsigned int, data_blocks)
+               __field(unsigned int, data_block_counter)
+               __field(unsigned int, packet_index)
+               __field(unsigned int, irq)
+               __field(unsigned int, index)
+       ),
+       TP_fast_assign(
+               __entry->second = cycles / CYCLES_PER_SECOND;
+               __entry->cycle = cycles % CYCLES_PER_SECOND;
+               __entry->channel = s->context->channel;
+               __entry->src = fw_parent_device(s->unit)->node_id;
+               __entry->dest = fw_parent_device(s->unit)->card->node_id;
+               __entry->payload_quadlets = payload_quadlets;
+               __entry->data_blocks = data_blocks,
+               __entry->data_block_counter = s->data_block_counter,
+               __entry->packet_index = s->packet_index;
+               __entry->irq = !!in_interrupt();
+               __entry->index = index;
+       ),
+       TP_printk(
+               "%02u %04u %04x %04x %02d %03u %3u %3u %02u %01u %02u",
+               __entry->second,
+               __entry->cycle,
+               __entry->src,
+               __entry->dest,
+               __entry->channel,
+               __entry->payload_quadlets,
+               __entry->data_blocks,
+               __entry->data_block_counter,
+               __entry->packet_index,
+               __entry->irq,
+               __entry->index)
+);
+
+TRACE_EVENT(out_packet_without_header,
+       TP_PROTO(const struct amdtp_stream *s, u32 cycles, unsigned int payload_length, unsigned int data_blocks, unsigned int index),
+       TP_ARGS(s, cycles, payload_length, data_blocks, index),
+       TP_STRUCT__entry(
+               __field(unsigned int, second)
+               __field(unsigned int, cycle)
+               __field(int, channel)
+               __field(int, src)
+               __field(int, dest)
+               __field(unsigned int, payload_quadlets)
+               __field(unsigned int, data_blocks)
+               __field(unsigned int, data_block_counter)
+               __field(unsigned int, packet_index)
+               __field(unsigned int, irq)
+               __field(unsigned int, index)
+       ),
+       TP_fast_assign(
+               __entry->second = cycles / CYCLES_PER_SECOND;
+               __entry->cycle = cycles % CYCLES_PER_SECOND;
+               __entry->channel = s->context->channel;
+               __entry->src = fw_parent_device(s->unit)->card->node_id;
+               __entry->dest = fw_parent_device(s->unit)->node_id;
+               __entry->payload_quadlets = payload_length / 4;
+               __entry->data_blocks = data_blocks,
+               __entry->data_blocks = s->data_block_counter,
+               __entry->packet_index = s->packet_index;
+               __entry->irq = !!in_interrupt();
+               __entry->index = index;
+       ),
+       TP_printk(
+               "%02u %04u %04x %04x %02d %03u %02u %03u %02u %01u %02u",
+               __entry->second,
+               __entry->cycle,
+               __entry->src,
+               __entry->dest,
+               __entry->channel,
+               __entry->payload_quadlets,
+               __entry->data_blocks,
+               __entry->data_block_counter,
+               __entry->packet_index,
+               __entry->irq,
+               __entry->index)
+);
+
 #endif
 
 #undef TRACE_INCLUDE_PATH