Re: ohci1394 regression in 2.6.19-rc1

Stefan Richter
2006-10-06T18:33:43Z

Alistair, could you please test the following one-liner on top of
2.6.19-rc1?

-----------------

Date: Fri, 6 Oct 2006 19:49:52 +0200 (CEST)
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: ieee1394: nodemgr: fix startup of knodemgrd

Revert a thinko in commit d2f119fe319528da8c76a1107459d6f478cbf28c:
When knodemgrd starts, it needs to sleep until host->generation was
incremented above its initial value of 0. My wrong logic caused it to
start sending requests when the bus wasn't completely ready. Seen as
"AT dma reset ctx=0, aborting transmission" messages in 2.6.19-rc1.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
Index: linux/drivers/ieee1394/nodemgr.c
===================================================================
--- linux.orig/drivers/ieee1394/nodemgr.c 2006-10-06 19:20:00.000000000 +0200
+++ linux/drivers/ieee1394/nodemgr.c 2006-10-06 19:26:28.000000000 +0200
@@ -1614,7 +1614,7 @@ static int nodemgr_host_thread(void *__h
{
struct host_info *hi = (struct host_info *)__hi;
struct hpsb_host *host = hi->host;
- unsigned int g, generation = get_hpsb_generation(host) - 1;
+ unsigned int g, generation = 0;
int i, reset_cycles = 0;

/* Setup our device-model entries */