Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64d0bf4d authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: add data_blocks/data_block_counter parameter to... 


ALSA: firewire-lib: add data_blocks/data_block_counter parameter to in_packet/out_packet tracing events

Tracing events for packets without CIP header have a parameter of
data_blocks/data_block_counter, but events for packets with CIP header
don't. This is not good to unify these events.

This commit adds the missing parameters to the events. In timing to
probe 'in_packet' event, data_blocks and data_block_counter are not
calculated yet. This commit also changes the timing.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4a10cecc

sound/firewire/amdtp-stream-trace.h

+18 −6
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <linux/tracepoint.h>



TRACE_EVENT(in_packet,

	TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int index),

	TP_ARGS(s, cycles, cip_header, payload_length, index),

	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)
@@ -25,6 +25,8 @@ TRACE_EVENT(in_packet, 
		__field(u32, cip_header0)

		__field(u32, cip_header1)

		__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)
@@ -38,12 +40,14 @@ TRACE_EVENT(in_packet, 
		__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->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 %08x %08x %03u %02u %01u %02u",

		"%02u %04u %04x %04x %02d %08x %08x %03u %02u %03u %02u %01u %02u",

		__entry->second,

		__entry->cycle,

		__entry->src,
@@ -52,14 +56,16 @@ TRACE_EVENT(in_packet, 
		__entry->cip_header0,

		__entry->cip_header1,

		__entry->payload_quadlets,

		__entry->data_blocks,

		__entry->data_block_counter,

		__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_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)
@@ -69,6 +75,8 @@ TRACE_EVENT(out_packet, 
		__field(u32, cip_header0)

		__field(u32, cip_header1)

		__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)
@@ -82,12 +90,14 @@ TRACE_EVENT(out_packet, 
		__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->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 %08x %08x %03u %02u %01u %02u",

		"%02u %04u %04x %04x %02d %08x %08x %03u %02u %03u %02u %01u %02u",

		__entry->second,

		__entry->cycle,

		__entry->src,
@@ -96,6 +106,8 @@ TRACE_EVENT(out_packet, 
		__entry->cip_header0,

		__entry->cip_header1,

		__entry->payload_quadlets,

		__entry->data_blocks,

		__entry->data_block_counter,

		__entry->packet_index,

		__entry->irq,

		__entry->index)

sound/firewire/amdtp-stream.c

+3 −3
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int handle_out_packet(struct amdtp_stream *s, 
				(s->data_block_counter + data_blocks) & 0xff;

	payload_length = 8 + data_blocks * 4 * s->data_block_quadlets;



	trace_out_packet(s, cycle, buffer, payload_length, index);

	trace_out_packet(s, cycle, buffer, payload_length, data_blocks, index);



	if (queue_out_packet(s, payload_length) < 0)

		return -EIO;
@@ -555,8 +555,6 @@ static int handle_in_packet(struct amdtp_stream *s, 
	cip_header[0] = be32_to_cpu(buffer[0]);

	cip_header[1] = be32_to_cpu(buffer[1]);



	trace_in_packet(s, cycle, buffer, payload_length, index);



	/*

	 * This module supports 'Two-quadlet CIP header with SYT field'.

	 * For convenience, also check FMT field is AM824 or not.
@@ -635,6 +633,8 @@ static int handle_in_packet(struct amdtp_stream *s, 
		return -EIO;

	}



	trace_in_packet(s, cycle, buffer, payload_length, data_blocks, index);



	syt = be32_to_cpu(buffer[1]) & CIP_SYT_MASK;

	pcm_frames = s->process_data_blocks(s, buffer + 2, data_blocks, &syt);