Commit aad32739 authored Apr 23, 2008 by Wendy Xiong Committed by Jeff Garzik Apr 25, 2008

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>

parent fb3b27bc

drivers/net/e1000e/netdev.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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));