The patch titled
e1000: Reset all functions after a PCI error
has been added to the -mm tree. Its filename is
e1000-reset-all-functions-after-a-pci-error.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: e1000: Reset all functions after a PCI error
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
During the handling of the PCI error recovery sequence, the current e1000
driver erroneously blocks a device reset for any but the first PCI
function. It shouldn't -- this is a cut-n-paste error from a different
driver (which tolerated only one hardware reset per hardware card).
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Cc: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Acked-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e1000/e1000_main.c | 4 ----
1 files changed, 4 deletions(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-reset-all-functions-after-a-pci-error drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c~e1000-reset-all-functions-after-a-pci-error
+++ a/drivers/net/e1000/e1000_main.c
@@ -4914,10 +4914,6 @@ static pci_ers_result_t e1000_io_slot_re
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);
- /* Perform card reset only on one instance of the card */
- if (PCI_FUNC (pdev->devfn) != 0)
- return PCI_ERS_RESULT_RECOVERED;
-
e1000_reset(adapter);
E1000_WRITE_REG(&adapter->hw, WUS, ~0);
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
e1000-reset-all-functions-after-a-pci-error.patch
pci-error-recovery-symbios-scsi-device-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
