commit 0ccead1869444891ae6b41f2c5fc8498521c908e
author Gary Zambrano <zambrano@broadcom.com> Tue Nov 14 16:34:00 2006 -0800
committer David S. Miller <davem@sunset.davemloft.net> Wed Nov 15 21:18:46 2006 -0800
tree 508dacf852deab9c26f8f3d3071cdaf456f6990b
parent 44597f65f6af3c692560a639f61d25398d13d1b6

[TG3]: Increase 5906 firmware poll time.

Newer 5906 bootcode needs about 7ms to finish resetting so the poll
firmware loop was changed to maximum 20ms.

Signed-off-by: Gary Zambrano <zambrano@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/tg3.c

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 06e4f77..6e86866 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4728,10 +4728,11 @@
 	u32 val;
 
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
-		for (i = 0; i < 400; i++) {
+		/* Wait up to 20ms for init done. */
+		for (i = 0; i < 200; i++) {
 			if (tr32(VCPU_STATUS) & VCPU_STATUS_INIT_DONE)
 				return 0;
-			udelay(10);
+			udelay(100);
 		}
 		return -ENODEV;
 	}