Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

firewire: core: record card index in bus_reset_handle tracepoints event

The bus reset event occurs in the bus managed by one of 1394 OHCI
controller in Linux system, however the existing tracepoints events has
the lack of data about it to distinguish the issued hardware from the
others.

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-9-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

+7 -4
+1 -1
drivers/firewire/core-topology.c
··· 508 508 struct fw_node *local_node; 509 509 unsigned long flags; 510 510 511 - trace_bus_reset_handle(generation, node_id, bm_abdicate, self_ids, self_id_count); 511 + trace_bus_reset_handle(card->index, generation, node_id, bm_abdicate, self_ids, self_id_count); 512 512 513 513 spin_lock_irqsave(&card->lock, flags); 514 514
+6 -3
include/trace/events/firewire.h
··· 339 339 ); 340 340 341 341 TRACE_EVENT(bus_reset_handle, 342 - TP_PROTO(unsigned int generation, unsigned int node_id, bool bm_abdicate, u32 *self_ids, unsigned int self_id_count), 343 - TP_ARGS(generation, node_id, bm_abdicate, self_ids, self_id_count), 342 + TP_PROTO(unsigned int card_index, unsigned int generation, unsigned int node_id, bool bm_abdicate, u32 *self_ids, unsigned int self_id_count), 343 + TP_ARGS(card_index, generation, node_id, bm_abdicate, self_ids, self_id_count), 344 344 TP_STRUCT__entry( 345 + __field(u8, card_index) 345 346 __field(u8, generation) 346 347 __field(u8, node_id) 347 348 __field(bool, bm_abdicate) 348 349 __dynamic_array(u32, self_ids, self_id_count) 349 350 ), 350 351 TP_fast_assign( 352 + __entry->card_index = card_index; 351 353 __entry->generation = generation; 352 354 __entry->node_id = node_id; 353 355 __entry->bm_abdicate = bm_abdicate; 354 356 memcpy(__get_dynamic_array(self_ids), self_ids, __get_dynamic_array_len(self_ids)); 355 357 ), 356 358 TP_printk( 357 - "generation=%u node_id=0x%04x bm_abdicate=%s self_ids=%s", 359 + "card_index=%u generation=%u node_id=0x%04x bm_abdicate=%s self_ids=%s", 360 + __entry->card_index, 358 361 __entry->generation, 359 362 __entry->node_id, 360 363 __entry->bm_abdicate ? "true" : "false",