Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1dc7cab authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: core: increase bus manager grace period 



Per IEEE 1394 clause 8.4.2.5, bus manager capable nodes which are not
incumbent shall wait at least 125ms before trying to establish
themselves as bus manager.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent a38a00fd

drivers/firewire/fw-card.c

+6 −5
Original line number Diff line number Diff line
@@ -368,9 +368,11 @@ static void fw_card_bm_work(struct work_struct *work) 
			atomic_read(&root_device->state) == FW_DEVICE_RUNNING;

	root_device_is_cmc = root_device && root_device->cmc;

	root_id = root_node->node_id;

	grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 10));

	irm_device = irm_node->data;

	local_device = local_node->data;



	grace = time_after(jiffies, card->reset_jiffies + DIV_ROUND_UP(HZ, 8));



	if (is_next_generation(generation, card->bm_generation) ||

	    (card->bm_generation != generation && grace)) {

		/*
@@ -434,12 +436,11 @@ static void fw_card_bm_work(struct work_struct *work) 
		}

	} else if (card->bm_generation != generation) {

		/*

		 * OK, we weren't BM in the last generation, and it's

		 * less than 100ms since last bus reset. Reschedule

		 * this task 100ms from now.

		 * We weren't BM in the last generation, and the last

		 * bus reset is less than 125ms ago.  Reschedule this job.

		 */

		spin_unlock_irqrestore(&card->lock, flags);

		fw_schedule_bm_work(card, DIV_ROUND_UP(HZ, 10));

		fw_schedule_bm_work(card, DIV_ROUND_UP(HZ, 8));

		goto out;

	}