From: Gary Zambrano <zambrano@broadcom.com>
Date: Wed, 15 Nov 2006 00:34:00 +0000 (-0800)
Subject: [TG3]: Increase 5906 firmware poll time.
X-Git-Tag: v2.6.19~87^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0ccead1869444891ae6b41f2c5fc8498521c908e;p=linux-2.6-omap-h63xx.git

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

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 06e4f77b098..6e86866bd3f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4728,10 +4728,11 @@ static int tg3_poll_fw(struct tg3 *tp)
 	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;
 	}