From: Auke Kok <auke-jan.h.kok@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: akpm@osdl.org, Jesse Brandeburg <jesse.brandeburg@intel.com>,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
linux-pci@atrey.karlin.mff.cuni.cz
Subject: Re: [PATCH] e1000: Reset all functions after a PCI error
Date: Tue, 17 Oct 2006 13:56:56 -0700 [thread overview]
Message-ID: <45354398.1000100@intel.com> (raw)
In-Reply-To: <20061017204206.GG6537@austin.ibm.com>
Linas Vepstas wrote:
> Please apply and forward upstream.
ACK
Jeff, please apply on top of today's fixes.
Auke
> --linas
>
> 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@austin.ibm.com>
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Cc: Auke Kok <auke-jan.h.kok@intel.com>
>
> ----
> drivers/net/e1000/e1000_main.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> Index: linux-2.6.19-rc1-git11/drivers/net/e1000/e1000_main.c
> ===================================================================
> --- linux-2.6.19-rc1-git11.orig/drivers/net/e1000/e1000_main.c 2006-10-17 15:02:25.000000000 -0500
> +++ linux-2.6.19-rc1-git11/drivers/net/e1000/e1000_main.c 2006-10-17 15:03:35.000000000 -0500
> @@ -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);
>
prev parent reply other threads:[~2006-10-17 21:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-17 20:42 [PATCH] e1000: Reset all functions after a PCI error Linas Vepstas
2006-10-17 20:56 ` Auke Kok [this message]
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=45354398.1000100@intel.com \
--to=auke-jan.h.kok@intel.com \
--cc=akpm@osdl.org \
--cc=jesse.brandeburg@intel.com \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=linuxppc-dev@ozlabs.org \
/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).