Home| summaryrefslogtreecommitdiff |
| author | Benjamin Poirier <bpoirier@suse.de> | 2012-07-13 14:10:32 (GMT) |
|---|---|---|
| committer | Benjamin Poirier <bpoirier@suse.de> | 2012-07-13 14:10:32 (GMT) |
| commit | 2f4a0fab66b33a9735d84e4c71b166ec988d3cf5 (patch) (side-by-side diff) | |
| tree | 1ee1606544e16d125fb3e4308e3a3883d4f4e679 | |
| parent | 730c50cecf5dc03779e9eb87bdf57fc48b4e1525 (diff) | |
be2net: Fix EEH error reset before a flash dump completes
(bnc#755546).
| -rw-r--r-- | patches.drivers/be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch | 33 | ||||
| -rw-r--r-- | series.conf | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.drivers/be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch b/patches.drivers/be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch new file mode 100644 index 0000000..20d933e --- a/dev/null +++ b/patches.drivers/be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch @@ -0,0 +1,33 @@ +From: Somnath Kotur <somnath.kotur@emulex.com> +Date: Wed, 2 May 2012 03:41:01 +0000 +Subject: [PATCH] be2net: Fix EEH error reset before a flash dump completes +Patch-mainline: v3.5-rc1 +Git-commit: eeb7fc7bc095546b21188e8e076a59bce73f9ca6 +References: bnc#755546 + +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> +Acked-by: Benjamin Poirier <bpoirier@suse.de> +--- + drivers/net/benet/be_main.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/benet/be_main.c ++++ b/drivers/net/benet/be_main.c +@@ -3588,6 +3588,11 @@ static pci_ers_result_t be_eeh_err_detec + + 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; + } + diff --git a/series.conf b/series.conf index 78d0210..5bb63d4 100644 --- a/series.conf +++ b/series.conf @@ -838,6 +838,7 @@ patches.fixes/macvtap-zerocopy-validate-vectors-before-building-sk.patch patches.drivers/be2net-non-member-vlan-pkts-not-received-in-promisco.patch patches.drivers/sky2-fix-regression-on-Yukon-Optima.patch + patches.drivers/be2net-Fix-EEH-error-reset-before-a-flash-dump-compl.patch ######################################################## # Wireless Networking |