Commit 07c446e3 authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

firewire: core: maintain phy packet receivers locally in cdev layer 

The list of receivers for phy packet is used only by cdev layer, while it
is maintained as a member of fw_card structure.

This commit maintains the list locally in cdev layer.

Link: https://lore.kernel.org/r/20250915234747.915922-3-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent 80c5b023

drivers/firewire/core-card.c

+0 −1
Original line number Diff line number Diff line
@@ -556,7 +556,6 @@ void fw_card_initialize(struct fw_card *card, 
	kref_init(&card->kref);

	init_completion(&card->done);

	INIT_LIST_HEAD(&card->transaction_list);

	INIT_LIST_HEAD(&card->phy_receiver_list);

	spin_lock_init(&card->lock);



	card->local_node = NULL;

drivers/firewire/core-cdev.c

+20 −7
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 
#define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW	5

#define FW_CDEV_VERSION_EVENT_ASYNC_TSTAMP	6



static DEFINE_SPINLOCK(phy_receiver_list_lock);

static LIST_HEAD(phy_receiver_list);



struct client {

	u32 version;

	struct fw_device *device;
@@ -1669,15 +1672,16 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg) 
static int ioctl_receive_phy_packets(struct client *client, union ioctl_arg *arg)

{

	struct fw_cdev_receive_phy_packets *a = &arg->receive_phy_packets;

	struct fw_card *card = client->device->card;



	/* Access policy: Allow this ioctl only on local nodes' device files. */

	if (!client->device->is_local)

		return -ENOSYS;



	guard(spinlock_irq)(&card->lock);

	// NOTE: This can be without irq when we can guarantee that __fw_send_request() for local

	// destination never runs in any type of IRQ context.

	scoped_guard(spinlock_irq, &phy_receiver_list_lock)

		list_move_tail(&client->phy_receiver_link, &phy_receiver_list);



	list_move_tail(&client->phy_receiver_link, &card->phy_receiver_list);

	client->phy_receiver_closure = a->closure;



	return 0;
@@ -1687,10 +1691,17 @@ void fw_cdev_handle_phy_packet(struct fw_card *card, struct fw_packet *p) 
{

	struct client *client;



	guard(spinlock_irqsave)(&card->lock);

	// NOTE: This can be without irqsave when we can guarantee that __fw_send_request() for local

	// destination never runs in any type of IRQ context.

	guard(spinlock_irqsave)(&phy_receiver_list_lock);



	list_for_each_entry(client, &phy_receiver_list, phy_receiver_link) {

		struct inbound_phy_packet_event *e;



		if (client->device->card != card)

			continue;



	list_for_each_entry(client, &card->phy_receiver_list, phy_receiver_link) {

		struct inbound_phy_packet_event *e = kmalloc(sizeof(*e) + 8, GFP_ATOMIC);

		e = kmalloc(sizeof(*e) + 8, GFP_ATOMIC);

		if (e == NULL)

			break;
@@ -1857,7 +1868,9 @@ static int fw_device_op_release(struct inode *inode, struct file *file) 
	struct client_resource *resource;

	unsigned long index;



	scoped_guard(spinlock_irq, &client->device->card->lock)

	// NOTE: This can be without irq when we can guarantee that __fw_send_request() for local

	// destination never runs in any type of IRQ context.

	scoped_guard(spinlock_irq, &phy_receiver_list_lock)

		list_del(&client->phy_receiver_link);



	scoped_guard(mutex, &client->device->client_list_mutex)

include/linux/firewire.h

+0 −2
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ struct fw_card { 
	int index;

	struct list_head link;



	struct list_head phy_receiver_list;



	struct delayed_work br_work; /* bus reset job */

	bool br_short;