ALSA: firewire_lib: add tracepoints for packets without CIP headers

Unique protocol is used for RME Fireface series. In this protocol,
payload format for isochronous packet is not compliant to CIP in
IEC 61883-1/6. The packet includes data blocks just with data channels,
without headers and any metadata.

In previous commits, ALSA IEC 61883-1/6 engine supports this protocol.
However, tracepoints are not supported yet, unlike implementation for
IEC 61883-1/6 protocol. This commit adds support of tracepoints for
the protocol.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index 850b36e27d0d3f9d4518ebba6807b4de16282ce0..ea0d486652c838cb08a424eed7d347315bceda42 100644 (file)
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -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

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index a03b37bdc27426515c24e83b863cc0a376bd9c70..f6af8e64c2cd4e2df944808e1aec9c350102b4b8 100644 (file)
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -479,6 +479,10 @@ static int handle_out_packet_without_header(struct amdtp_stream *s,
        s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff;
 
        payload_length = data_blocks * 4 * s->data_block_quadlets;
+
+       trace_out_packet_without_header(s, cycle, payload_length, data_blocks,
+                                       index);
+
        if (queue_out_packet(s, payload_length) < 0)
                return -EIO;
 
@@ -617,6 +621,10 @@ static int handle_in_packet_without_header(struct amdtp_stream *s,
 
        buffer = s->buffer.packets[s->packet_index].buffer;
        data_blocks = payload_quadlets / s->data_block_quadlets;
+
+       trace_in_packet_without_header(s, cycle, payload_quadlets, data_blocks,
+                                      index);
+
        pcm_frames = s->process_data_blocks(s, buffer, data_blocks, NULL);
        s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff;