summaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorGary Zambrano <zambrano@broadcom.com>2006-11-14 16:34:00 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-11-15 21:18:46 -0800
commit0ccead1869444891ae6b41f2c5fc8498521c908e (patch)
tree508dacf852deab9c26f8f3d3071cdaf456f6990b /drivers/net/tg3.c
parent44597f65f6af3c692560a639f61d25398d13d1b6 (diff)
downloadop-kernel-dev-0ccead1869444891ae6b41f2c5fc8498521c908e.zip
op-kernel-dev-0ccead1869444891ae6b41f2c5fc8498521c908e.tar.gz
[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>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c5
1 files changed, 3 insertions, 2 deletions
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 @@ 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;
}
OpenPOWER on IntegriCloud