Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6d24eb6 authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller
Browse files

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: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a55a603d

drivers/net/enic/vnic_rq.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/enic/vnic_wq.c

+2 −2
Original line number Diff line number Diff line
@@ -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);