enic: Bug Fix: Fix timeout for hardware Tx and Rx queue disable operations
authorVasanthy Kolluri <vkolluri@cisco.com>
Thu, 18 Mar 2010 16:19:49 +0000 (16:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Mar 2010 04:22:48 +0000 (21:22 -0700)
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>
drivers/net/enic/vnic_rq.c
drivers/net/enic/vnic_wq.c

index 75583978a5e54f01fd37f6f921fab22027ccb641..7bcd90373487c1cbf50f9fcec1d3319a5388d627 100644 (file)
@@ -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);
index d2e00e51b7b56a1fdafb032b0cc9332b60b54efe..44fc3234d585eeb5e8013bf2c1de6c5fa074b197 100644 (file)
@@ -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);