summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorWendy Xiong <wendyx@us.ibm.com>2008-04-23 11:09:24 -0700
committerJeff Garzik <jgarzik@redhat.com>2008-04-25 02:07:13 -0400
commitfb3b27bc00ca2b6d69c3a22ff43b4d95fef47bed (patch)
tree9f0b14b9f9529681fea0ce5d0eeb2b9ae2b822b1 /drivers/net/ixgbe
parent7b1be1987c1e8163b3631dcd1ce4f03707d60c3b (diff)
downloadkernel-crypto-fb3b27bc00ca2b6d69c3a22ff43b4d95fef47bed.tar.gz
kernel-crypto-fb3b27bc00ca2b6d69c3a22ff43b4d95fef47bed.tar.xz
kernel-crypto-fb3b27bc00ca2b6d69c3a22ff43b4d95fef47bed.zip
ixgbe: save and restore pcie/msi state to support EEH recovery
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> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index cb371a8c24a..7b859220c25 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);