firewire: fw-ohci: fix debug logging of phy packets
PATCH 1/2 firewire: fw-ohci: fix debug logging of phy packets
Fix harmless but irritating off-by-one bug in patch "firewire: debug interrupt events". Should be folded into that one.
See OHCI 1.1 clause 8.7.1.4.
--- drivers/firewire/fw-ohci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firewire/fw-ohci.c +3 -3
@@ -371,10 +371,10 @@ static void log_ar_at_event(char dir, inif (unlikely (evt >=ARRAY_SIZE (evts))) evt =0x1f ; -if (header[0 ] == ~header[1 ]) { +if (header[1 ] == ~header[2 ]) {printk (KERN_DEBUG "A%c %s, %s, %08x\n" , - dir, evts[evt], phys[header[0 ] >>30 &0x3 ], - header[0 ]); + dir, evts[evt], phys[header[1 ] >>30 &0x3 ], + header[1 ]);return ; }
Signature · 3 lines
Stefan Richter -=====-==--- -=-- -=-== http://arcgraph.de/sr/
PATCH 2/2 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.
--- drivers/firewire/fw-ohci.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/firewire/fw-ohci.c +12 -5
@@ -302,13 +302,13 @@ static char _p(u32 *s, int shift)return port[*s >> shift &3 ]; } -static void log_selfids (int generation,int self_id_count,u32 *s) +static void log_selfids (int node_id,int generation,int self_id_count,u32 *s) {if (likely (!(param_debug &OHCI_PARAM_DEBUG_SELFIDS )))return ; - printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d\n", - self_id_count, generation); + printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d, " + "local node ID %04x\n", self_id_count, generation, node_id);for (; self_id_count--; ++s)if ((*s &1 <<23 ) ==0 )
@@ -371,6 +371,12 @@ static void log_ar_at_event(char dir, inif (unlikely (evt >=ARRAY_SIZE (evts))) evt =0x1f ; +if (evt == OHCI1394_evt_bus_reset) { +printk (KERN_DEBUG "A%c evt_bus_reset, generation %d\n" , + dir, (header[2 ] >>16 ) &0xff ); +return ; + } +if (header[1 ] == ~header[2 ]) { printk(KERN_DEBUG "A%c %s, %s, %08x\n", dir, evts[evt], phys[header[1] >> 30 & 0x3],
@@ -417,7 +423,7 @@ static void log_ar_at_event(char dir, in#else #define log_irqs (evt) -#define log_selfids (generation, self_id_count, sid) +#define log_selfids (node_id, generation, self_id_count, sid)#define log_ar_at_event (dir, speed, header, evt)#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */
@@ -1320,7 +1326,8 @@ static void bus_reset_tasklet(unsigned ldma_free_coherent (ohci->card.device,CONFIG_ROM_SIZE , free_rom, free_rom_bus); -log_selfids (generation, self_id_count, ohci->self_id_buffer); +log_selfids (ohci->node_id, generation, + self_id_count, ohci->self_id_buffer);fw_core_handle_bus_reset (&ohci->card, ohci->node_id, generation, self_id_count, ohci->self_id_buffer);
Signature · 3 lines
Stefan Richter -=====-==--- -=-- -=-== http://arcgraph.de/sr/
Re: [PATCH 2/2] firewire: fw-ohci: extend logging of bus generations and node ID
Quoted 11 lines · Stefan Richter
Extend the logging of "AR
evt_bus_reset, link internal" to "ARevt_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 <[email protected]>---
Good addition for debugging purposes.
Signature · 2 lines
Jarod Wilson [email protected]
drivers/firewire/fw-ohci.c static void log_ar_at_event(char dir, in · line 377
Quoted 13 lines · I wrote:
drivers/firewire/fw-ohci.c +3
-3@@ -371,10 +371,10 @@ static void log_ar_at_event(char dir, inif (unlikely (evt >=ARRAY_SIZE (evts))) evt =0x1f ; -if (header[0 ] == ~header[1 ]) { +if (header[1 ] == ~header[2 ]) {printk (KERN_DEBUG "A%c %s, %s, %08x\n" , - dir, evts[evt], phys[header[0 ] >>30 &0x3 ], - header[0 ]); + dir, evts[evt], phys[header[1 ] >>30 &0x3 ], + header[1 ]);
This patch is bogus. The indices were right.
Signature · 3 lines
Stefan Richter -=====-==--- -=-- -==-- http://arcgraph.de/sr/