Commit 1212fa1b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Merge for 5.18-rc1

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 03a8b0df 7b0efea4

drivers/firewire/core-card.c

+3 −0
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ EXPORT_SYMBOL_GPL(fw_card_release); 
void fw_core_remove_card(struct fw_card *card)

{

	struct fw_card_driver dummy_driver = dummy_driver_template;

	unsigned long flags;



	card->driver->update_phy_reg(card, 4,

				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
@@ -693,7 +694,9 @@ void fw_core_remove_card(struct fw_card *card) 
	dummy_driver.stop_iso		= card->driver->stop_iso;

	card->driver = &dummy_driver;



	spin_lock_irqsave(&card->lock, flags);

	fw_destroy_nodes(card);

	spin_unlock_irqrestore(&card->lock, flags);



	/* Wait for all users, especially device workqueue jobs, to finish. */

	fw_card_put(card);

drivers/firewire/core-cdev.c

+3 −1
Original line number Diff line number Diff line
@@ -1502,6 +1502,7 @@ static void outbound_phy_packet_callback(struct fw_packet *packet, 
{

	struct outbound_phy_packet_event *e =

		container_of(packet, struct outbound_phy_packet_event, p);

	struct client *e_client;



	switch (status) {

	/* expected: */
@@ -1518,9 +1519,10 @@ static void outbound_phy_packet_callback(struct fw_packet *packet, 
	}

	e->phy_packet.data[0] = packet->timestamp;



	e_client = e->client;

	queue_event(e->client, &e->event, &e->phy_packet,

		    sizeof(e->phy_packet) + e->phy_packet.length, NULL, 0);

	client_put(e->client);

	client_put(e_client);

}



static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)

drivers/firewire/core-topology.c

+3 −6
Original line number Diff line number Diff line
@@ -375,16 +375,13 @@ static void report_found_node(struct fw_card *card, 
	card->bm_retries = 0;

}



/* Must be called with card->lock held */

void fw_destroy_nodes(struct fw_card *card)

{

	unsigned long flags;



	spin_lock_irqsave(&card->lock, flags);

	card->color++;

	if (card->local_node != NULL)

		for_each_fw_node(card, card->local_node, report_lost_node);

	card->local_node = NULL;

	spin_unlock_irqrestore(&card->lock, flags);

}



static void move_tree(struct fw_node *node0, struct fw_node *node1, int port)
@@ -510,6 +507,8 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, 
	struct fw_node *local_node;

	unsigned long flags;



	spin_lock_irqsave(&card->lock, flags);



	/*

	 * If the selfID buffer is not the immediate successor of the

	 * previously processed one, we cannot reliably compare the
@@ -521,8 +520,6 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation, 
		card->bm_retries = 0;

	}



	spin_lock_irqsave(&card->lock, flags);



	card->broadcast_channel_allocated = card->broadcast_channel_auto_allocated;

	card->node_id = node_id;

	/*

drivers/firewire/core-transaction.c

+16 −14
Original line number Diff line number Diff line
@@ -73,24 +73,25 @@ static int try_cancel_split_timeout(struct fw_transaction *t) 
static int close_transaction(struct fw_transaction *transaction,

			     struct fw_card *card, int rcode)

{

	struct fw_transaction *t;

	struct fw_transaction *t = NULL, *iter;

	unsigned long flags;



	spin_lock_irqsave(&card->lock, flags);

	list_for_each_entry(t, &card->transaction_list, link) {

		if (t == transaction) {

			if (!try_cancel_split_timeout(t)) {

	list_for_each_entry(iter, &card->transaction_list, link) {

		if (iter == transaction) {

			if (!try_cancel_split_timeout(iter)) {

				spin_unlock_irqrestore(&card->lock, flags);

				goto timed_out;

			}

			list_del_init(&t->link);

			card->tlabel_mask &= ~(1ULL << t->tlabel);

			list_del_init(&iter->link);

			card->tlabel_mask &= ~(1ULL << iter->tlabel);

			t = iter;

			break;

		}

	}

	spin_unlock_irqrestore(&card->lock, flags);



	if (&t->link != &card->transaction_list) {

	if (t) {

		t->callback(card, rcode, NULL, 0, t->callback_data);

		return 0;

	}
@@ -953,7 +954,7 @@ EXPORT_SYMBOL(fw_core_handle_request); 


void fw_core_handle_response(struct fw_card *card, struct fw_packet *p)

{

	struct fw_transaction *t;

	struct fw_transaction *t = NULL, *iter;

	unsigned long flags;

	u32 *data;

	size_t data_length;
@@ -965,20 +966,21 @@ void fw_core_handle_response(struct fw_card *card, struct fw_packet *p) 
	rcode	= HEADER_GET_RCODE(p->header[1]);



	spin_lock_irqsave(&card->lock, flags);

	list_for_each_entry(t, &card->transaction_list, link) {

		if (t->node_id == source && t->tlabel == tlabel) {

			if (!try_cancel_split_timeout(t)) {

	list_for_each_entry(iter, &card->transaction_list, link) {

		if (iter->node_id == source && iter->tlabel == tlabel) {

			if (!try_cancel_split_timeout(iter)) {

				spin_unlock_irqrestore(&card->lock, flags);

				goto timed_out;

			}

			list_del_init(&t->link);

			card->tlabel_mask &= ~(1ULL << t->tlabel);

			list_del_init(&iter->link);

			card->tlabel_mask &= ~(1ULL << iter->tlabel);

			t = iter;

			break;

		}

	}

	spin_unlock_irqrestore(&card->lock, flags);



	if (&t->link == &card->transaction_list) {

	if (!t) {

 timed_out:

		fw_notice(card, "unsolicited response (source %x, tlabel %x)\n",

			  source, tlabel);

drivers/firewire/sbp2.c

+7 −6
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ static void sbp2_status_write(struct fw_card *card, struct fw_request *request, 
			      void *payload, size_t length, void *callback_data)

{

	struct sbp2_logical_unit *lu = callback_data;

	struct sbp2_orb *orb;

	struct sbp2_orb *orb = NULL, *iter;

	struct sbp2_status status;

	unsigned long flags;
@@ -433,17 +433,18 @@ static void sbp2_status_write(struct fw_card *card, struct fw_request *request, 


	/* Lookup the orb corresponding to this status write. */

	spin_lock_irqsave(&lu->tgt->lock, flags);

	list_for_each_entry(orb, &lu->orb_list, link) {

	list_for_each_entry(iter, &lu->orb_list, link) {

		if (STATUS_GET_ORB_HIGH(status) == 0 &&

		    STATUS_GET_ORB_LOW(status) == orb->request_bus) {

			orb->rcode = RCODE_COMPLETE;

			list_del(&orb->link);

		    STATUS_GET_ORB_LOW(status) == iter->request_bus) {

			iter->rcode = RCODE_COMPLETE;

			list_del(&iter->link);

			orb = iter;

			break;

		}

	}

	spin_unlock_irqrestore(&lu->tgt->lock, flags);



	if (&orb->link != &lu->orb_list) {

	if (orb) {

		orb->callback(orb, &status);

		kref_put(&orb->kref, free_orb); /* orb callback reference */

	} else {