Commit 3cb44a72 authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

firewire: core: record card index in async_phy_outbound_initiate tracepoints event 

The asynchronous transaction is initiated on one of 1394 OHCI
controller, however the existing tracepoints events has the lack of data
about it.

This commit adds card_index member into event structure to store the index
of host controller in use, and prints it.

Link: https://lore.kernel.org/r/20240613131440.431766-5-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent 65ec7ebe

drivers/firewire/core-cdev.c

+2 −2
Original line number Diff line number Diff line
@@ -1659,8 +1659,8 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg) 
		memcpy(pp->data, a->data, sizeof(a->data));

	}



	trace_async_phy_outbound_initiate((uintptr_t)&e->p, e->p.generation, e->p.header[1],

					  e->p.header[2]);

	trace_async_phy_outbound_initiate((uintptr_t)&e->p, card->index, e->p.generation,

					  e->p.header[1], e->p.header[2]);



	card->driver->send_request(card, &e->p);

drivers/firewire/core-transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void fw_send_phy_config(struct fw_card *card, 
	phy_config_packet.generation = generation;

	reinit_completion(&phy_config_done);



	trace_async_phy_outbound_initiate((uintptr_t)&phy_config_packet,

	trace_async_phy_outbound_initiate((uintptr_t)&phy_config_packet, card->index,

					  phy_config_packet.generation, phy_config_packet.header[1],

					  phy_config_packet.header[2]);

include/trace/events/firewire.h

+6 −3
Original line number Diff line number Diff line
@@ -217,23 +217,26 @@ DEFINE_EVENT(async_outbound_complete_template, async_response_outbound_complete, 
#undef ASYNC_HEADER_GET_RCODE



TRACE_EVENT(async_phy_outbound_initiate,

	TP_PROTO(u64 packet, unsigned int generation, u32 first_quadlet, u32 second_quadlet),

	TP_ARGS(packet, generation, first_quadlet, second_quadlet),

	TP_PROTO(u64 packet, unsigned int card_index, unsigned int generation, u32 first_quadlet, u32 second_quadlet),

	TP_ARGS(packet, card_index, generation, first_quadlet, second_quadlet),

	TP_STRUCT__entry(

		__field(u64, packet)

		__field(u8, card_index)

		__field(u8, generation)

		__field(u32, first_quadlet)

		__field(u32, second_quadlet)

	),

	TP_fast_assign(

		__entry->packet = packet;

		__entry->card_index = card_index;

		__entry->generation = generation;

		__entry->first_quadlet = first_quadlet;

		__entry->second_quadlet = second_quadlet

	),

	TP_printk(

		"packet=0x%llx generation=%u first_quadlet=0x%08x second_quadlet=0x%08x",

		"packet=0x%llx card_index=%u generation=%u first_quadlet=0x%08x second_quadlet=0x%08x",

		__entry->packet,

		__entry->card_index,

		__entry->generation,

		__entry->first_quadlet,

		__entry->second_quadlet