aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/fw-ohci.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-10 18:51:15 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 11:55:35 -0400
commit08ddb2f4c270b5dff063f7dbcd7e9248a52e7c65 (patch)
tree25e5764b72854a9ba30bf14d3296010f1977fb19 /drivers/firewire/fw-ohci.c
parenta007bb857e0b26f5d8b73c2ff90782d9c0972620 (diff)
firewire: fw-ohci: extend logging of bus generations and node ID
Extend the logging of "AR evt_bus_reset, link internal" to "AR evt_bus_reset, generation ${selfIDGeneration}". That way we can check whether this generation matches the one seen in self ID complete event logging. See OHCI 1.1 clause 8.4.2.3. Also extend logging of "firewire_ohci: * selfIDs, generation *" by "local node ID ffc*" in self ID logging to make the local node in AT/AR event logs more obvious. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jarod Wilson <jwilson@redhat.com>
Diffstat (limited to 'drivers/firewire/fw-ohci.c')
-rw-r--r--drivers/firewire/fw-ohci.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 46660ac0dac..b98d81967f7 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -302,13 +302,13 @@ static char _p(u32 *s, int shift)
302 return port[*s >> shift & 3]; 302 return port[*s >> shift & 3];
303} 303}
304 304
305static void log_selfids(int generation, int self_id_count, u32 *s) 305static void log_selfids(int node_id, int generation, int self_id_count, u32 *s)
306{ 306{
307 if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS))) 307 if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS)))
308 return; 308 return;
309 309
310 printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d\n", 310 printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d, "
311 self_id_count, generation); 311 "local node ID %04x\n", self_id_count, generation, node_id);
312 312
313 for (; self_id_count--; ++s) 313 for (; self_id_count--; ++s)
314 if ((*s & 1 << 23) == 0) 314 if ((*s & 1 << 23) == 0)
@@ -371,6 +371,12 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt)
371 if (unlikely(evt >= ARRAY_SIZE(evts))) 371 if (unlikely(evt >= ARRAY_SIZE(evts)))
372 evt = 0x1f; 372 evt = 0x1f;
373 373
374 if (evt == OHCI1394_evt_bus_reset) {
375 printk(KERN_DEBUG "A%c evt_bus_reset, generation %d\n",
376 dir, (header[2] >> 16) & 0xff);
377 return;
378 }
379
374 if (header[0] == ~header[1]) { 380 if (header[0] == ~header[1]) {
375 printk(KERN_DEBUG "A%c %s, %s, %08x\n", 381 printk(KERN_DEBUG "A%c %s, %s, %08x\n",
376 dir, evts[evt], phys[header[0] >> 30 & 0x3], 382 dir, evts[evt], phys[header[0] >> 30 & 0x3],
@@ -417,7 +423,7 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt)
417#else 423#else
418 424
419#define log_irqs(evt) 425#define log_irqs(evt)
420#define log_selfids(generation, self_id_count, sid) 426#define log_selfids(node_id, generation, self_id_count, sid)
421#define log_ar_at_event(dir, speed, header, evt) 427#define log_ar_at_event(dir, speed, header, evt)
422 428
423#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */ 429#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */
@@ -1320,7 +1326,8 @@ static void bus_reset_tasklet(unsigned long data)
1320 dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE, 1326 dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
1321 free_rom, free_rom_bus); 1327 free_rom, free_rom_bus);
1322 1328
1323 log_selfids(generation, self_id_count, ohci->self_id_buffer); 1329 log_selfids(ohci->node_id, generation,
1330 self_id_count, ohci->self_id_buffer);
1324 1331
1325 fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation, 1332 fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation,
1326 self_id_count, ohci->self_id_buffer); 1333 self_id_count, ohci->self_id_buffer);