From: linas@austin.ibm.com (Linas Vepstas)
To: Jesse Brandeburg <jesse.brandeburg@intel.com>,
Rajesh Shah <rajesh.shah@intel.com>,
"Ronciak, John" <john.ronciak@intel.com>,
Grant Grundler <grundler@parisc-linux.org>,
"bibo,mao" <bibo.mao@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz,
netdev@vger.kernel.org, akpm@osdl.org
Subject: Subject: [PATCH 1/2]: e100 disable device on PCI error
Date: Thu, 29 Jun 2006 15:06:44 -0500 [thread overview]
Message-ID: <20060629200644.GA29526@austin.ibm.com> (raw)
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.
Please submit uptream.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
----
drivers/net/e100.c | 1 +
1 file changed, 1 insertion(+)
Index: linux-2.6.17-mm3/drivers/net/e100.c
===================================================================
--- linux-2.6.17-mm3.orig/drivers/net/e100.c 2006-06-27 11:39:08.000000000 -0500
+++ linux-2.6.17-mm3/drivers/net/e100.c 2006-06-29 14:18:40.000000000 -0500
@@ -2742,6 +2742,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;
next reply other threads:[~2006-06-29 20:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-29 20:06 Linas Vepstas [this message]
2006-06-29 20:11 ` [PATCH 2/2]: e1000 disable device on PCI error Linas Vepstas
2006-06-29 20:19 ` Subject: [PATCH 1/2]: e100 " Auke Kok
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060629200644.GA29526@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=akpm@osdl.org \
--cc=bibo.mao@intel.com \
--cc=grundler@parisc-linux.org \
--cc=jesse.brandeburg@intel.com \
--cc=john.ronciak@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=netdev@vger.kernel.org \
--cc=rajesh.shah@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).