diff options
| author | Vasanthy Kolluri <vkolluri@cisco.com> | 2010-03-18 16:19:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-18 21:22:48 -0700 |
| commit | b6d24eb663cdf4af9c08b37ad2e31056c5eb2561 (patch) | |
| tree | 74feb13f2f56a6e58660553a935498614f401a55 | |
| parent | a55a603dae47a1ea4fbfad3a3a428ea7a0900ab6 (diff) | |
| download | op-kernel-dev-b6d24eb663cdf4af9c08b37ad2e31056c5eb2561.zip op-kernel-dev-b6d24eb663cdf4af9c08b37ad2e31056c5eb2561.tar.gz | |
enic: Bug Fix: Fix timeout for hardware Tx and Rx queue disable operations
The timeout for hardware Tx and Rx queue disable operations is increased to
work-around an erratum for "unnamed" chipset where a DMA completion may take
upto 10ms. We have to wait atleast this long for hardware to signal that Tx
and Rx queues are quiesced.
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/enic/vnic_rq.c | 4 | ||||
| -rw-r--r-- | drivers/net/enic/vnic_wq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c index 7558397..7bcd903 100644 --- a/drivers/net/enic/vnic_rq.c +++ b/drivers/net/enic/vnic_rq.c @@ -167,10 +167,10 @@ int vnic_rq_disable(struct vnic_rq *rq) iowrite32(0, &rq->ctrl->enable); /* Wait for HW to ACK disable request */ - for (wait = 0; wait < 100; wait++) { + for (wait = 0; wait < 1000; wait++) { if (!(ioread32(&rq->ctrl->running))) return 0; - udelay(1); + udelay(10); } printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index); diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c index d2e00e5..44fc323 100644 --- a/drivers/net/enic/vnic_wq.c +++ b/drivers/net/enic/vnic_wq.c @@ -160,10 +160,10 @@ int vnic_wq_disable(struct vnic_wq *wq) iowrite32(0, &wq->ctrl->enable); /* Wait for HW to ACK disable request */ - for (wait = 0; wait < 100; wait++) { + for (wait = 0; wait < 1000; wait++) { if (!(ioread32(&wq->ctrl->running))) return 0; - udelay(1); + udelay(10); } printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index); |
