Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewire: fix synchronization of gap counts

Browse source 
Fix:  The fact that nodes had different gap counts would be overlooked
if the bus manager code would pick gap count 63 because of beta
repeaters or because of very large hop counts.  In this case, the bus
manager code would miss that it actually has to send the PHY config
packet with gap count 63.

Related trivial changes:  Use bool for an int used as bool, touch up
some comments.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2008-03-24 20:57:12 +01:00
parent 2a0a259049
commit 25b1c3d888
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/firewire/fw-card.c
View file

@ -220,7 +220,7 @@ fw_card_bm_work(struct work_struct *work)
struct bm_data bmd; struct bm_data bmd;
unsigned long flags; unsigned long flags;
int root_id, new_root_id, irm_id, gap_count, generation, grace; int root_id, new_root_id, irm_id, gap_count, generation, grace;
int do_reset = 0; bool do_reset = false;
spin_lock_irqsave(&card->lock, flags); spin_lock_irqsave(&card->lock, flags);
local_node = card->local_node; local_node = card->local_node;
@ -360,14 +360,14 @@ fw_card_bm_work(struct work_struct *work)
gap_count = 63; gap_count = 63;
/* /*
* Finally, figure out if we should do a reset or not. If we've * Finally, figure out if we should do a reset or not. If we have
* done less that 5 resets with the same physical topology and we * done less than 5 resets with the same physical topology and we
* have either a new root or a new gap count setting, let's do it. * have either a new root or a new gap count setting, let's do it.
*/ */
if (card->bm_retries++ < 5 && if (card->bm_retries++ < 5 &&
(card->gap_count != gap_count || new_root_id != root_id)) (card->gap_count != gap_count || new_root_id != root_id))
do_reset = 1; do_reset = true;
spin_unlock_irqrestore(&card->lock, flags); spin_unlock_irqrestore(&card->lock, flags);

7
drivers/firewire/fw-topology.c
View file

@ -290,12 +290,11 @@ static struct fw_node *build_tree(struct fw_card *card,
beta_repeaters_present = true; beta_repeaters_present = true;
/* /*
* If all PHYs does not report the same gap count * If PHYs report different gap counts, set an invalid count
* setting, we fall back to 63 which will force a gap * which will force a gap count reconfiguration and a reset.
* count reconfiguration and a reset.
*/ */
if (SELF_ID_GAP_COUNT(q) != gap_count) if (SELF_ID_GAP_COUNT(q) != gap_count)
gap_count = 63; gap_count = 0;
update_hop_count(node); update_hop_count(node);