aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorSomnath Kotur <somnath.kotur@emulex.com>2012-05-02 03:41:01 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-02 21:07:24 -0400
commiteeb7fc7bc095546b21188e8e076a59bce73f9ca6 (patch)
treefc97caa025c77db177654fa68ffd0af574c9319e /drivers/net/ethernet/emulex
parentbe2net: Record receive queue index in skb to aid RPS. (diff)
downloadlinux-dev-eeb7fc7bc095546b21188e8e076a59bce73f9ca6.tar.xz
linux-dev-eeb7fc7bc095546b21188e8e076a59bce73f9ca6.zip
be2net: Fix EEH error reset before a flash dump completes
An EEH error can cause the FW to trigger a flash debug dump. Resetting the card while flash dump is in progress can cause it not to recover. Wait for it to finish before letting EEH flow to reset the card. Signed-off-by: Sathya Perla <Sathya.Perla@emulex.com> Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index b7bc905a93fb..6d5d30be0481 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3821,6 +3821,11 @@ static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,
pci_disable_device(pdev);
+ /* The error could cause the FW to trigger a flash debug dump.
+ * Resetting the card while flash dump is in progress
+ * can cause it not to recover; wait for it to finish
+ */
+ ssleep(30);
return PCI_ERS_RESULT_NEED_RESET;
}