]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[TG3]: Increase 5906 firmware poll time.
authorGary Zambrano <zambrano@broadcom.com>
Wed, 15 Nov 2006 00:34:00 +0000 (16:34 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 16 Nov 2006 05:18:46 +0000 (21:18 -0800)
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

index 06e4f77b0988c465356e365e5d1f0fd9ae8b4476..6e86866bd3fac87fd795ca624e359d19f7e2fc69 100644 (file)
@@ -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;
        }