diff options
| author | Yuval Mintz <Yuval.Mintz@qlogic.com> | 2016-03-13 21:21:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-16 19:23:35 -0400 |
| commit | d78a1f08458f8118cf42154e55a3006cc17502bc (patch) | |
| tree | d9256d1fa4487f3a6f92bd7057f6b75877a7836c /drivers/net/ethernet/broadcom/bnx2x | |
| parent | 489ce5f441e4094a3419d7e8e29fd756b7f391d4 (diff) | |
| download | linux-stable-d78a1f08458f8118cf42154e55a3006cc17502bc.tar.gz linux-stable-d78a1f08458f8118cf42154e55a3006cc17502bc.tar.bz2 linux-stable-d78a1f08458f8118cf42154e55a3006cc17502bc.zip | |
bnx2x: don't wait for Tx completion on recovery
When driver has hit a parity event, HW can no longer write to host memory.
As a result, Tx completions cannot be written to the host SB memory, and
waiting for Tx completions eventually timeout.
As driver is willing to delay as much as 1-2 seconds per Tx queue for its
draining and this delay is sequential, the time to recover might greatly
lengthen needlessly in case the recovery is done under multi-connection
traffic.
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index a949783c8fc3..0a9108cd4c45 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3042,8 +3042,12 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) bnx2x_save_statistics(bp); } - /* wait till consumers catch up with producers in all queues */ - bnx2x_drain_tx_queues(bp); + /* wait till consumers catch up with producers in all queues. + * If we're recovering, FW can't write to host so no reason + * to wait for the queues to complete all Tx. + */ + if (unload_mode != UNLOAD_RECOVERY) + bnx2x_drain_tx_queues(bp); /* if VF indicate to PF this function is going down (PF will delete sp * elements and clear initializations |