Skip to content

Commit be2fa88

Browse files
torvaldstorvalds
committed
Merge tag 'firewire-fixes-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire fixes from Takashi Sakamoto: - Update tracepoints events introduced in v6.10-rc1 so that it includes the numeric identifier of host card in which the event happens - replace wiki URL with the current website URL in Kconfig * tag 'firewire-fixes-6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: core: record card index in bus_reset_handle tracepoints event firewire: core: record card index in tracepoinrts events derived from bus_reset_arrange_template firewire: core: record card index in async_phy_inbound tracepoints event firewire: core: record card index in async_phy_outbound_complete tracepoints event firewire: core: record card index in async_phy_outbound_initiate tracepoints event firewire: core: record card index in tracepoinrts events derived from async_inbound_template firewire: core: record card index in tracepoinrts events derived from async_outbound_initiate_template firewire: core: record card index in tracepoinrts events derived from async_outbound_complete_template firewire: fix website URL in Kconfig
2 parents fcf2a99 + 893098b commit be2fa88

File tree

6 files changed

+93
-66
lines changed

6 files changed

+93
-66
lines changed

‎drivers/firewire/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ config FIREWIRE
1111
This is the new-generation IEEE 1394 (FireWire) driver stack
1212
a.k.a. Juju, a new implementation designed for robustness and
1313
simplicity.
14-
See http://ieee1394.wiki.kernel.org/index.php/Juju_Migration
14+
See http://ieee1394.docs.kernel.org/en/latest/migration.html
1515
for information about migration from the older Linux 1394 stack
1616
to the new driver stack.
1717

‎drivers/firewire/core-card.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@ static int reset_bus(struct fw_card *card, bool short_reset)
222222
int reg = short_reset ? 5 : 1;
223223
int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;
224224

225-
trace_bus_reset_initiate(card->generation, short_reset);
225+
trace_bus_reset_initiate(card->index, card->generation, short_reset);
226226

227227
return card->driver->update_phy_reg(card, reg, 0, bit);
228228
}
229229

230230
void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset)
231231
{
232-
trace_bus_reset_schedule(card->generation, short_reset);
232+
trace_bus_reset_schedule(card->index, card->generation, short_reset);
233233

234234
/* We don't try hard to sort out requests of long vs. short resets. */
235235
card->br_short = short_reset;
@@ -249,7 +249,7 @@ static void br_work(struct work_struct *work)
249249
/* Delay for 2s after last reset per IEEE 1394 clause 8.2.1. */
250250
if (card->reset_jiffies != 0 &&
251251
time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) {
252-
trace_bus_reset_postpone(card->generation, card->br_short);
252+
trace_bus_reset_postpone(card->index, card->generation, card->br_short);
253253

254254
if (!queue_delayed_work(fw_workqueue, &card->br_work, 2 * HZ))
255255
fw_card_put(card);

‎drivers/firewire/core-cdev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,7 @@ static void outbound_phy_packet_callback(struct fw_packet *packet,
15591559
struct client *e_client = e->client;
15601560
u32 rcode;
15611561

1562-
trace_async_phy_outbound_complete((uintptr_t)packet, status, packet->generation,
1562+
trace_async_phy_outbound_complete((uintptr_t)packet, card->index, status, packet->generation,
15631563
packet->timestamp);
15641564

15651565
switch (status) {
@@ -1659,8 +1659,8 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)
16591659
memcpy(pp->data, a->data, sizeof(a->data));
16601660
}
16611661

1662-
trace_async_phy_outbound_initiate((uintptr_t)&e->p, e->p.generation, e->p.header[1],
1663-
e->p.header[2]);
1662+
trace_async_phy_outbound_initiate((uintptr_t)&e->p, card->index, e->p.generation,
1663+
e->p.header[1], e->p.header[2]);
16641664

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

‎drivers/firewire/core-topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
508508
struct fw_node *local_node;
509509
unsigned long flags;
510510

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);
512512

513513
spin_lock_irqsave(&card->lock, flags);
514514

‎drivers/firewire/core-transaction.c

Lines changed: 16 additions & 14 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:
@@ -398,7 +398,8 @@ void __fw_send_request(struct fw_card *card, struct fw_transaction *t, int tcode
398398

399399
spin_unlock_irqrestore(&card->lock, flags);
400400

401-
trace_async_request_outbound_initiate((uintptr_t)t, generation, speed, t->packet.header, payload,
401+
trace_async_request_outbound_initiate((uintptr_t)t, card->index, generation, speed,
402+
t->packet.header, payload,
402403
tcode_is_read_request(tcode) ? 0 : length / 4);
403404

404405
card->driver->send_request(card, &t->packet);
@@ -463,7 +464,7 @@ static DECLARE_COMPLETION(phy_config_done);
463464
static void transmit_phy_packet_callback(struct fw_packet *packet,
464465
struct fw_card *card, int status)
465466
{
466-
trace_async_phy_outbound_complete((uintptr_t)packet, packet->generation, status,
467+
trace_async_phy_outbound_complete((uintptr_t)packet, card->index, packet->generation, status,
467468
packet->timestamp);
468469
complete(&phy_config_done);
469470
}
@@ -503,7 +504,7 @@ void fw_send_phy_config(struct fw_card *card,
503504
phy_config_packet.generation = generation;
504505
reinit_completion(&phy_config_done);
505506

506-
trace_async_phy_outbound_initiate((uintptr_t)&phy_config_packet,
507+
trace_async_phy_outbound_initiate((uintptr_t)&phy_config_packet, card->index,
507508
phy_config_packet.generation, phy_config_packet.header[1],
508509
phy_config_packet.header[2]);
509510

@@ -674,7 +675,7 @@ static void free_response_callback(struct fw_packet *packet,
674675
{
675676
struct fw_request *request = container_of(packet, struct fw_request, response);
676677

677-
trace_async_response_outbound_complete((uintptr_t)request, packet->generation,
678+
trace_async_response_outbound_complete((uintptr_t)request, card->index, packet->generation,
678679
packet->speed, status, packet->timestamp);
679680

680681
// Decrease the reference count since not at in-flight.
@@ -879,9 +880,10 @@ void fw_send_response(struct fw_card *card,
879880
// Increase the reference count so that the object is kept during in-flight.
880881
fw_request_get(request);
881882

882-
trace_async_response_outbound_initiate((uintptr_t)request, request->response.generation,
883-
request->response.speed, request->response.header,
884-
data, data ? data_length / 4 : 0);
883+
trace_async_response_outbound_initiate((uintptr_t)request, card->index,
884+
request->response.generation, request->response.speed,
885+
request->response.header, data,
886+
data ? data_length / 4 : 0);
885887

886888
card->driver->send_response(card, &request->response);
887889
}
@@ -995,7 +997,7 @@ void fw_core_handle_request(struct fw_card *card, struct fw_packet *p)
995997

996998
tcode = async_header_get_tcode(p->header);
997999
if (tcode_is_link_internal(tcode)) {
998-
trace_async_phy_inbound((uintptr_t)p, p->generation, p->ack, p->timestamp,
1000+
trace_async_phy_inbound((uintptr_t)p, card->index, p->generation, p->ack, p->timestamp,
9991001
p->header[1], p->header[2]);
10001002
fw_cdev_handle_phy_packet(card, p);
10011003
return;
@@ -1007,8 +1009,8 @@ void fw_core_handle_request(struct fw_card *card, struct fw_packet *p)
10071009
return;
10081010
}
10091011

1010-
trace_async_request_inbound((uintptr_t)request, p->generation, p->speed, p->ack,
1011-
p->timestamp, p->header, request->data,
1012+
trace_async_request_inbound((uintptr_t)request, card->index, p->generation, p->speed,
1013+
p->ack, p->timestamp, p->header, request->data,
10121014
tcode_is_read_request(tcode) ? 0 : request->length / 4);
10131015

10141016
offset = async_header_get_offset(p->header);
@@ -1078,8 +1080,8 @@ void fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
10781080
}
10791081
spin_unlock_irqrestore(&card->lock, flags);
10801082

1081-
trace_async_response_inbound((uintptr_t)t, p->generation, p->speed, p->ack, p->timestamp,
1082-
p->header, data, data_length / 4);
1083+
trace_async_response_inbound((uintptr_t)t, card->index, p->generation, p->speed, p->ack,
1084+
p->timestamp, p->header, data, data_length / 4);
10831085

10841086
if (!t) {
10851087
timed_out:

0 commit comments

Comments
 (0)