fm10k: don't stop reset due to FM10K_ERR_REQUESTS_PENDING

Browse source

Don't report FM10K_ERR_REQUESTS_PENDING when we fail to disable queues
within the timeout. This can occur due to a hardware Tx hang, or when
the switch ethernet fabric is resetting while we are transmitting
traffic. It can sometimes take up to 500ms before the Tx DMA engine
gives up. Instead, just skip the DMA engine check and perform
a data-path reset anyways. Add a statistic counter to keep track of the
number of resets occurring while we have pending DMA on the rings.

In order to prevent having to re-assign err to 0, re-order the
last few items of the reset_hw_pf function so that we don't perform
"return err" at the end.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

...

This commit is contained in:

Jacob Keller 2016-06-07 16:08:47 -07:00 • committed by Jeff Kirsher

parent 5e93cbadd3

commit ce33624f37

4 changed files with 24 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

View file

24

drivers/net/ethernet/intel/fm10k/fm10k_pf.c

View file

1

drivers/net/ethernet/intel/fm10k/fm10k_type.h

View file

12

drivers/net/ethernet/intel/fm10k/fm10k_vf.c

View file