Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit e7da16a

Browse files
committed
firewire: core: record card index in tracepoinrts events derived from async_outbound_complete_template
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-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
1 parent e789523 commit e7da16a

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

drivers/firewire/core-transaction.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ static void transmit_complete_callback(struct fw_packet *packet,
174174
struct fw_transaction *t =
175175
container_of(packet, struct fw_transaction, packet);
176176

177-
trace_async_request_outbound_complete((uintptr_t)t, packet->generation, packet->speed,
178-
status, packet->timestamp);
177+
trace_async_request_outbound_complete((uintptr_t)t, card->index, packet->generation,
178+
packet->speed, status, packet->timestamp);
179179

180180
switch (status) {
181181
case ACK_COMPLETE:
@@ -674,7 +674,7 @@ static void free_response_callback(struct fw_packet *packet,
674674
{
675675
struct fw_request *request = container_of(packet, struct fw_request, response);
676676

677-
trace_async_response_outbound_complete((uintptr_t)request, packet->generation,
677+
trace_async_response_outbound_complete((uintptr_t)request, card->index, packet->generation,
678678
packet->speed, status, packet->timestamp);
679679

680680
// Decrease the reference count since not at in-flight.

include/trace/events/firewire.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,28 @@ DECLARE_EVENT_CLASS(async_outbound_initiate_template,
7171

7272
// The value of status is one of ack codes and rcodes specific to Linux FireWire subsystem.
7373
DECLARE_EVENT_CLASS(async_outbound_complete_template,
74-
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
75-
TP_ARGS(transaction, generation, scode, status, timestamp),
74+
TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
75+
TP_ARGS(transaction, card_index, generation, scode, status, timestamp),
7676
TP_STRUCT__entry(
7777
__field(u64, transaction)
78+
__field(u8, card_index)
7879
__field(u8, generation)
7980
__field(u8, scode)
8081
__field(u8, status)
8182
__field(u16, timestamp)
8283
),
8384
TP_fast_assign(
8485
__entry->transaction = transaction;
86+
__entry->card_index = card_index;
8587
__entry->generation = generation;
8688
__entry->scode = scode;
8789
__entry->status = status;
8890
__entry->timestamp = timestamp;
8991
),
9092
TP_printk(
91-
"transaction=0x%llx generation=%u scode=%u status=%u timestamp=0x%04x",
93+
"transaction=0x%llx card_index=%u generation=%u scode=%u status=%u timestamp=0x%04x",
9294
__entry->transaction,
95+
__entry->card_index,
9396
__entry->generation,
9497
__entry->scode,
9598
__entry->status,
@@ -144,8 +147,8 @@ DEFINE_EVENT(async_outbound_initiate_template, async_request_outbound_initiate,
144147
);
145148

146149
DEFINE_EVENT(async_outbound_complete_template, async_request_outbound_complete,
147-
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
148-
TP_ARGS(transaction, generation, scode, status, timestamp)
150+
TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
151+
TP_ARGS(transaction, card_index, generation, scode, status, timestamp)
149152
);
150153

151154
DEFINE_EVENT(async_inbound_template, async_response_inbound,
@@ -194,8 +197,8 @@ DEFINE_EVENT_PRINT(async_outbound_initiate_template, async_response_outbound_ini
194197
);
195198

196199
DEFINE_EVENT(async_outbound_complete_template, async_response_outbound_complete,
197-
TP_PROTO(u64 transaction, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
198-
TP_ARGS(transaction, generation, scode, status, timestamp)
200+
TP_PROTO(u64 transaction, unsigned int card_index, unsigned int generation, unsigned int scode, unsigned int status, unsigned int timestamp),
201+
TP_ARGS(transaction, card_index, generation, scode, status, timestamp)
199202
);
200203

201204
#undef ASYNC_HEADER_GET_DESTINATION

0 commit comments

Comments
 (0)