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

Merge tag 'firewire-updates-6.10' of... 

Merge tag 'firewire-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire updates from Takashi Sakamoto:
 "During the development period of v6.8 kernel, it became evident that
  there was a lack of helper utilities to trace the initial state of
  bus, while investigating certain PHYs compliant with different
  versions of IEEE 1394 specification.

  This series of changes includes the addition of tracepoints events,
  provided by 'firewire' subsystem. These events enable tracing of how
  firewire core functions during bus reset and asynchronous
  communication over IEEE 1394 bus.

  When implementing the tracepoints events, it was found that the
  existing serialization and deserialization helpers for several types
  of asynchronous packets are scattered across both firewire-core and
  firewire-ohci kernel modules. A set of inline functions is newly added
  to address it, along with some KUnit tests, serving as the foundation
  for the tracepoints events. This renders the dispersed code obsolete.

  The remaining changes constitute the final steps in phasing out the
  usage of deprecated PCI MSI APIs, in continuation from the previous
  version"

* tag 'firewire-updates-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: (29 commits)
  firewire: obsolete usage of *-objs in Makefile for KUnit test
  firewire: core: remove flag and width from u64 formats of tracepoints events
  firewire: core: fix type of timestamp for async_inbound_template tracepoints events
  firewire: core: add tracepoint event for handling bus reset
  Revert "firewire: core: option to log bus reset initiation"
  firewire: core: add tracepoints events for initiating bus reset
  firewire: ohci: obsolete OHCI_PARAM_DEBUG_BUSRESETS from debug module parameter
  firewire: ohci: add bus-reset event for initial set of handled irq
  firewire: core: add tracepoints event for asynchronous inbound phy packet
  firewire: core/cdev: add tracepoints events for asynchronous phy packet
  firewire: core: add tracepoints events for asynchronous outbound response
  firewire: core: add tracepoint event for asynchronous inbound request
  firewire: core: add tracepoints event for asynchronous inbound response
  firewire: core: add tracepoints events for asynchronous outbound request
  firewire: core: add support for Linux kernel tracepoints
  firewire: core: replace local macros with common inline functions for isochronous packet header
  firewire: core: add common macro to serialize/deserialize isochronous packet header
  firewire: core: obsolete tcode check macros with inline functions
  firewire: ohci: replace hard-coded values with common macros
  firewire: ohci: replace hard-coded values with inline functions for asynchronous packet header
  ...
parents 4f8b6f25 21151fd8

drivers/firewire/.kunitconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ CONFIG_PCI=y 
CONFIG_FIREWIRE=y

CONFIG_FIREWIRE_KUNIT_UAPI_TEST=y

CONFIG_FIREWIRE_KUNIT_DEVICE_ATTRIBUTE_TEST=y

CONFIG_FIREWIRE_KUNIT_PACKET_SERDES_TEST=y

drivers/firewire/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -50,6 +50,22 @@ config FIREWIRE_KUNIT_DEVICE_ATTRIBUTE_TEST 
	  For more information on KUnit and unit tests in general, refer

	  to the KUnit documentation in Documentation/dev-tools/kunit/.



config FIREWIRE_KUNIT_PACKET_SERDES_TEST

	tristate "KUnit tests for packet serialization/deserialization" if !KUNIT_ALL_TESTS

	depends on FIREWIRE && KUNIT

	default KUNIT_ALL_TESTS

	help

	  This builds the KUnit tests for packet serialization and

	  deserialization.



	  KUnit tests run during boot and output the results to the debug

	  log in TAP format (https://testanything.org/). Only useful for

	  kernel devs running KUnit test harness and are not for inclusion

	  into a production build.



	  For more information on KUnit and unit tests in general, refer

	  to the KUnit documentation in Documentation/dev-tools/kunit/.



config FIREWIRE_OHCI

	tristate "OHCI-1394 controllers"

	depends on PCI && FIREWIRE && MMU

drivers/firewire/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Makefile for the Linux IEEE 1394 implementation

#



firewire-core-y += core-card.o core-cdev.o core-device.o \

firewire-core-y += core-trace.o core-card.o core-cdev.o core-device.o \

                   core-iso.o core-topology.o core-transaction.o

firewire-ohci-y += ohci.o

firewire-sbp2-y += sbp2.o
@@ -16,5 +16,5 @@ obj-$(CONFIG_FIREWIRE_NET) += firewire-net.o 
obj-$(CONFIG_FIREWIRE_NOSY) += nosy.o

obj-$(CONFIG_PROVIDE_OHCI1394_DMA_INIT) += init_ohci1394_dma.o



firewire-uapi-test-objs += uapi-test.o

obj-$(CONFIG_FIREWIRE_KUNIT_UAPI_TEST) += firewire-uapi-test.o
 
obj-$(CONFIG_FIREWIRE_KUNIT_UAPI_TEST) += uapi-test.o

obj-$(CONFIG_FIREWIRE_KUNIT_PACKET_SERDES_TEST) += packet-serdes-test.o

drivers/firewire/core-card.c

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/byteorder.h>



#include "core.h"

#include <trace/events/firewire.h>



#define define_fw_printk_level(func, kern_level)		\

void func(const struct fw_card *card, const char *fmt, ...)	\
@@ -221,11 +222,15 @@ 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);



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



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

	card->br_short = short_reset;
@@ -244,6 +249,8 @@ 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);



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

			fw_card_put(card);

		return;

drivers/firewire/core-cdev.c

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 




#include "core.h"

#include <trace/events/firewire.h>



/*

 * ABI version history is documented in linux/firewire-cdev.h.
@@ -1558,6 +1559,9 @@ 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,

					  packet->timestamp);



	switch (status) {

	// expected:

	case ACK_COMPLETE:
@@ -1655,6 +1659,9 @@ 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]);



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



	return 0;