netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Auke Kok <auke-jan.h.kok@intel.com>
To: jeff@garzik.org
Cc: netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net
Subject: [PATCH 5/8] ixgbe: save and restore pcie/msi state to support EEH recovery
Date: Wed, 23 Apr 2008 11:09:24 -0700	[thread overview]
Message-ID: <20080423180924.24972.60794.stgit@localhost.localdomain> (raw)
In-Reply-To: <20080423180900.24972.84015.stgit@localhost.localdomain>

From: Wendy Xiong <wendyx@us.ibm.com>

To enable EEH support for pci-express network adapters, pcie/msi state
needs to be saved and restored for that adapter.

Tested this EEH patch with Intel 10G pci-express ixgbe adapter.

Signed-off-by: Wendy Xiong <wendyx@us.ibm.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 drivers/net/ixgbe/ixgbe_main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index cb371a8..7b85922 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3431,6 +3431,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 	}
 
 	pci_set_master(pdev);
+	pci_save_state(pdev);
 
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
 	netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), MAX_TX_QUEUES);
@@ -3721,6 +3722,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
 		return PCI_ERS_RESULT_DISCONNECT;
 	}
 	pci_set_master(pdev);
+	pci_restore_state(pdev);
 
 	pci_enable_wake(pdev, PCI_D3hot, 0);
 	pci_enable_wake(pdev, PCI_D3cold, 0);


  parent reply	other threads:[~2008-04-23 18:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-23 18:09 [PATCH 1/8] e1000e: cleanup several stats issues Auke Kok
2008-04-23 18:09 ` [PATCH 2/8] e1000e: Add interrupt moderation run-time ethtool interface Auke Kok
2008-04-23 18:09 ` [PATCH 3/8] e1000e: Fix HW Error on es2lan, ARP capture issue by BMC Auke Kok
2008-04-23 18:09 ` [PATCH 4/8] e1000e: lower ring minimum size to 64 Auke Kok
2008-04-23 18:12   ` [E1000-devel] " Kok, Auke
2008-04-23 18:09 ` Auke Kok [this message]
2008-04-23 18:09 ` [PATCH 6/8] e1000e: save and restore pcie/msi state to support EEH recovery Auke Kok
2008-04-23 18:09 ` [PATCH 7/8] [RESEND] igb: " Auke Kok
2008-04-23 18:09 ` [PATCH 8/8] e1000e: Increment version to 0.2.1 Auke Kok
2008-04-25  6:01 ` [PATCH 1/8] e1000e: cleanup several stats issues Jeff Garzik
2008-04-25 16:39   ` Kok, Auke
2008-04-28 22:13   ` Kok, Auke

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=20080423180924.24972.60794.stgit@localhost.localdomain \
    --to=auke-jan.h.kok@intel.com \
    --cc=e1000-devel@lists.sourceforge.net \
    --cc=jeff@garzik.org \
    --cc=netdev@vger.kernel.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).