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

Commit 08ddb2f4 authored by Stefan Richter's avatar Stefan Richter
Browse files

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJarod Wilson <jwilson@redhat.com>
parent a007bb85

drivers/firewire/fw-ohci.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -302,13 +302,13 @@ static char _p(u32 *s, int shift) 
	return port[*s >> shift & 3];

	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)))

	if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS)))

		return;

		return;





	printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d\n",

	printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d, "

	       self_id_count, generation);

	       "local node ID %04x\n", self_id_count, generation, node_id);





	for (; self_id_count--; ++s)

	for (; self_id_count--; ++s)

		if ((*s & 1 << 23) == 0)

		if ((*s & 1 << 23) == 0)
@@ -371,6 +371,12 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt) 
	if (unlikely(evt >= ARRAY_SIZE(evts)))

	if (unlikely(evt >= ARRAY_SIZE(evts)))

			evt = 0x1f;

			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[0] == ~header[1]) {

	if (header[0] == ~header[1]) {

		printk(KERN_DEBUG "A%c %s, %s, %08x\n",

		printk(KERN_DEBUG "A%c %s, %s, %08x\n",

		       dir, evts[evt], phys[header[0] >> 30 & 0x3],

		       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) 
#else

#else





#define log_irqs(evt)

#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)

#define log_ar_at_event(dir, speed, header, evt)





#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */

#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */
@@ -1320,7 +1326,8 @@ static void bus_reset_tasklet(unsigned long data) 
		dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,

		dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,

				  free_rom, free_rom_bus);

				  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,

	fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation,

				 self_id_count, ohci->self_id_buffer);

				 self_id_count, ohci->self_id_buffer);