Commit be2fa886 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-fixes-6.10-rc4' of... 

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
parents fcf2a997 893098b2

drivers/firewire/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ config FIREWIRE 
	  This is the new-generation IEEE 1394 (FireWire) driver stack

	  a.k.a. Juju, a new implementation designed for robustness and

	  simplicity.

	  See http://ieee1394.wiki.kernel.org/index.php/Juju_Migration

	  See http://ieee1394.docs.kernel.org/en/latest/migration.html

	  for information about migration from the older Linux 1394 stack

	  to the new driver stack.

drivers/firewire/core-card.c

+3 −3
Original line number Diff line number Diff line
@@ -222,14 +222,14 @@ static int reset_bus(struct fw_card *card, bool short_reset) 
	int reg = short_reset ? 5 : 1;

	int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;



	trace_bus_reset_initiate(card->generation, short_reset);

	trace_bus_reset_initiate(card->index, card->generation, short_reset);



	return card->driver->update_phy_reg(card, reg, 0, bit);

}



void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset)

{

	trace_bus_reset_schedule(card->generation, short_reset);

	trace_bus_reset_schedule(card->index, card->generation, short_reset);



	/* We don't try hard to sort out requests of long vs. short resets. */

	card->br_short = short_reset;
@@ -249,7 +249,7 @@ static void br_work(struct work_struct *work) 
	/* Delay for 2s after last reset per IEEE 1394 clause 8.2.1. */

	if (card->reset_jiffies != 0 &&

	    time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) {

		trace_bus_reset_postpone(card->generation, card->br_short);

		trace_bus_reset_postpone(card->index, card->generation, card->br_short);



		if (!queue_delayed_work(fw_workqueue, &card->br_work, 2 * HZ))

			fw_card_put(card);

drivers/firewire/core-cdev.c

+3 −3
Original line number Diff line number Diff line
@@ -1559,7 +1559,7 @@ static void outbound_phy_packet_callback(struct fw_packet *packet, 
	struct client *e_client = e->client;

	u32 rcode;



	trace_async_phy_outbound_complete((uintptr_t)packet, status, packet->generation,

	trace_async_phy_outbound_complete((uintptr_t)packet, card->index, status, packet->generation,

					  packet->timestamp);



	switch (status) {
@@ -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-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, 
	struct fw_node *local_node;

	unsigned long flags;



	trace_bus_reset_handle(generation, node_id, bm_abdicate, self_ids, self_id_count);

	trace_bus_reset_handle(card->index, generation, node_id, bm_abdicate, self_ids, self_id_count);



	spin_lock_irqsave(&card->lock, flags);

drivers/firewire/core-transaction.c

+16 −14
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static void transmit_complete_callback(struct fw_packet *packet, 
	struct fw_transaction *t =

	    container_of(packet, struct fw_transaction, packet);



	trace_async_request_outbound_complete((uintptr_t)t, packet->generation, packet->speed,

					      status, packet->timestamp);

	trace_async_request_outbound_complete((uintptr_t)t, card->index, packet->generation,

					      packet->speed, status, packet->timestamp);



	switch (status) {

	case ACK_COMPLETE:
@@ -398,7 +398,8 @@ void __fw_send_request(struct fw_card *card, struct fw_transaction *t, int tcode 


	spin_unlock_irqrestore(&card->lock, flags);



	trace_async_request_outbound_initiate((uintptr_t)t, generation, speed, t->packet.header, payload,

	trace_async_request_outbound_initiate((uintptr_t)t, card->index, generation, speed,

					      t->packet.header, payload,

					      tcode_is_read_request(tcode) ? 0 : length / 4);



	card->driver->send_request(card, &t->packet);
@@ -463,7 +464,7 @@ static DECLARE_COMPLETION(phy_config_done); 
static void transmit_phy_packet_callback(struct fw_packet *packet,

					 struct fw_card *card, int status)

{

	trace_async_phy_outbound_complete((uintptr_t)packet, packet->generation, status,

	trace_async_phy_outbound_complete((uintptr_t)packet, card->index, packet->generation, status,

					  packet->timestamp);

	complete(&phy_config_done);

}
@@ -503,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]);
@@ -674,7 +675,7 @@ static void free_response_callback(struct fw_packet *packet, 
{

	struct fw_request *request = container_of(packet, struct fw_request, response);



	trace_async_response_outbound_complete((uintptr_t)request, packet->generation,

	trace_async_response_outbound_complete((uintptr_t)request, card->index, packet->generation,

					       packet->speed, status, packet->timestamp);



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

	fw_request_get(request);



	trace_async_response_outbound_initiate((uintptr_t)request, request->response.generation,

					       request->response.speed, request->response.header,

					       data, data ? data_length / 4 : 0);

	trace_async_response_outbound_initiate((uintptr_t)request, card->index,

					       request->response.generation, request->response.speed,

					       request->response.header, data,

					       data ? data_length / 4 : 0);



	card->driver->send_response(card, &request->response);

}
@@ -995,7 +997,7 @@ void fw_core_handle_request(struct fw_card *card, struct fw_packet *p) 


	tcode = async_header_get_tcode(p->header);

	if (tcode_is_link_internal(tcode)) {

		trace_async_phy_inbound((uintptr_t)p, p->generation, p->ack, p->timestamp,

		trace_async_phy_inbound((uintptr_t)p, card->index, p->generation, p->ack, p->timestamp,

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

		fw_cdev_handle_phy_packet(card, p);

		return;
@@ -1007,8 +1009,8 @@ void fw_core_handle_request(struct fw_card *card, struct fw_packet *p) 
		return;

	}



	trace_async_request_inbound((uintptr_t)request, p->generation, p->speed, p->ack,

				    p->timestamp, p->header, request->data,

	trace_async_request_inbound((uintptr_t)request, card->index, p->generation, p->speed,

				    p->ack, p->timestamp, p->header, request->data,

				    tcode_is_read_request(tcode) ? 0 : request->length / 4);



	offset = async_header_get_offset(p->header);
@@ -1078,8 +1080,8 @@ void fw_core_handle_response(struct fw_card *card, struct fw_packet *p) 
	}

	spin_unlock_irqrestore(&card->lock, flags);



	trace_async_response_inbound((uintptr_t)t, p->generation, p->speed, p->ack, p->timestamp,

				     p->header, data, data_length / 4);

	trace_async_response_inbound((uintptr_t)t, card->index, p->generation, p->speed, p->ack,

				     p->timestamp, p->header, data, data_length / 4);



	if (!t) {

 timed_out: