The patch titled
e100: disable device on PCI error
has been added to the -mm tree. Its filename is
e100-disable-device-on-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: e100: disable device on PCI error
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
A recent patch in -mm3 titled
gregkh-pci-pci-don-t-enable-device-if-already-enabled.patch
causes pci_enable_device() to be a no-op if the kernel thinks
that the device is already enabled. This change breaks the
PCI error recovery mechanism in the e100 device driver, since,
after PCI slot reset, the card is no longer enabled. This is
a trivial fix for this problem. Tested.
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e100.c | 1 +
1 files changed, 1 insertion(+)
diff -puN drivers/net/e100.c~e100-disable-device-on-pci-error drivers/net/e100.c
--- a/drivers/net/e100.c~e100-disable-device-on-pci-error
+++ a/drivers/net/e100.c
@@ -2799,6 +2799,7 @@ static pci_ers_result_t e100_io_error_de
/* Detach; put netif into state similar to hotplug unplug. */
netif_poll_enable(netdev);
netif_device_detach(netdev);
+ pci_disable_device(pdev);
/* Request a slot reset. */
return PCI_ERS_RESULT_NEED_RESET;
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
git-netdev-all.patch
chardev-checking-of-overlapping-ranges.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
