Merge tag 'mtd/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

[linux.git] / sound / firewire / amdtp-stream-trace.h

diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index edb5c3afa6f8c7ba5ece70f34ee51efba2657825..4adbbf789cbe80c1fd2040e9685d79dde806f154 100644 (file)
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -13,147 +13,16 @@
 
 #include <linux/tracepoint.h>
 
-TRACE_EVENT(in_packet,
-       TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 *cip_header, 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)
-               __field(int, channel)
-               __field(int, src)
-               __field(int, dest)
-               __field(u32, cip_header0)
-               __field(u32, cip_header1)
-               __field(unsigned int, payload_quadlets)
-               __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->cip_header0 = cip_header[0];
-               __entry->cip_header1 = cip_header[1];
-               __entry->payload_quadlets = payload_length / 4;
-               __entry->packet_index = s->packet_index;
-               __entry->irq = !!in_interrupt();
-               __entry->index = index;
-       ),
-       TP_printk(
-               "%02u %04u %04x %04x %02d %08x %08x %03u %02u %01u %02u",
-               __entry->second,
-               __entry->cycle,
-               __entry->src,
-               __entry->dest,
-               __entry->channel,
-               __entry->cip_header0,
-               __entry->cip_header1,
-               __entry->payload_quadlets,
-               __entry->packet_index,
-               __entry->irq,
-               __entry->index)
-);
-
-TRACE_EVENT(out_packet,
-       TP_PROTO(const struct amdtp_stream *s, u32 cycles, __be32 *cip_header, 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)
-               __field(int, channel)
-               __field(int, src)
-               __field(int, dest)
-               __field(u32, cip_header0)
-               __field(u32, cip_header1)
-               __field(unsigned int, payload_quadlets)
-               __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->cip_header0 = be32_to_cpu(cip_header[0]);
-               __entry->cip_header1 = be32_to_cpu(cip_header[1]);
-               __entry->payload_quadlets = payload_length / 4;
-               __entry->packet_index = s->packet_index;
-               __entry->irq = !!in_interrupt();
-               __entry->index = index;
-       ),
-       TP_printk(
-               "%02u %04u %04x %04x %02d %08x %08x %03u %02u %01u %02u",
-               __entry->second,
-               __entry->cycle,
-               __entry->src,
-               __entry->dest,
-               __entry->channel,
-               __entry->cip_header0,
-               __entry->cip_header1,
-               __entry->payload_quadlets,
-               __entry->packet_index,
-               __entry->irq,
-               __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 %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)
-);
-
-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),
+TRACE_EVENT(amdtp_packet,
+       TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int data_blocks, unsigned int index),
+       TP_ARGS(s, cycles, cip_header, 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)
+               __dynamic_array(u8, cip_header, cip_header ? 8 : 0)
                __field(unsigned int, payload_quadlets)
                __field(unsigned int, data_blocks)
                __field(unsigned int, data_block_counter)
@@ -165,17 +34,26 @@ TRACE_EVENT(out_packet_without_header,
                __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,
+               if (s->direction == AMDTP_IN_STREAM) {
+                       __entry->src = fw_parent_device(s->unit)->node_id;
+                       __entry->dest = fw_parent_device(s->unit)->card->node_id;
+               } else {
+                       __entry->src = fw_parent_device(s->unit)->card->node_id;
+                       __entry->dest = fw_parent_device(s->unit)->node_id;
+               }
+               if (cip_header) {
+                       memcpy(__get_dynamic_array(cip_header), cip_header,
+                              __get_dynamic_array_len(cip_header));
+               }
+               __entry->payload_quadlets = payload_length / sizeof(__be32);
+               __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 %02u %03u %02u %01u %02u",
+               "%02u %04u %04x %04x %02d %03u %02u %03u %02u %01u %02u %s",
                __entry->second,
                __entry->cycle,
                __entry->src,
@@ -186,7 +64,10 @@ TRACE_EVENT(out_packet_without_header,
                __entry->data_block_counter,
                __entry->packet_index,
                __entry->irq,
-               __entry->index)
+               __entry->index,
+               __print_array(__get_dynamic_array(cip_header),
+                             __get_dynamic_array_len(cip_header),
+                             sizeof(u8)))
 );
 
 #endif