diff options
| author | Wendy Xiong | 2008-04-23 20:09:29 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2008-04-25 08:08:04 +0200 |
| commit | aad32739641d3a75818fbe653d4b0d530e965f2f (patch) | |
| tree | d88a61fec2e8ae05015cfa0f170fe9cc9eab9c41 | |
| parent | ixgbe: save and restore pcie/msi state to support EEH recovery (diff) | |
| download | kernel-qcow2-linux-aad32739641d3a75818fbe653d4b0d530e965f2f.tar.gz kernel-qcow2-linux-aad32739641d3a75818fbe653d4b0d530e965f2f.tar.xz kernel-qcow2-linux-aad32739641d3a75818fbe653d4b0d530e965f2f.zip | |
e1000e: 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 2ports and 4ports pci-express e1000e
adapters.
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>
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 9d1143aa6189..603ef9a6ddc1 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -3807,6 +3807,7 @@ static pci_ers_result_t e1000_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); @@ -3933,6 +3934,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, goto err_pci_reg; pci_set_master(pdev); + pci_save_state(pdev); err = -ENOMEM; netdev = alloc_etherdev(sizeof(struct e1000_adapter)); |