Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b8f04a authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: call pci_save_state() after pci_restore_state() 



Due to a change in pci_restore_state()[1] which clears the saved_state
flag, the driver should call pci_save_state() to set the flag once again
to avoid issues with EEH (same fix that recently was submitted for ixgbe).

[1] commmit 4b77b0a2

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c651a8c1

drivers/net/e1000e/netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -4674,6 +4674,7 @@ static int e1000_resume(struct pci_dev *pdev) 


	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_save_state(pdev);

	e1000e_disable_l1aspm(pdev);



	err = pci_enable_device_mem(pdev);
@@ -4825,6 +4826,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) 
	} else {

		pci_set_master(pdev);

		pci_restore_state(pdev);

		pci_save_state(pdev);



		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);