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

Commit 5f5ae6fc authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state 



The main reason for this change is to keep the suspend/resume logic matched
up. The clear_interrupt_scheme function will disable MSI-X which will
effect the PCIe configuration space. Therefore we will want to do it before
we save state to avoid having the interrupt state restored by
pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via
ixgbe_setup_interrupt_scheme.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fc77dc3c

drivers/net/ixgbe/ixgbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -5327,6 +5327,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 
		ixgbe_free_all_rx_resources(adapter);

	}



	ixgbe_clear_interrupt_scheme(adapter);



#ifdef CONFIG_PM

	retval = pci_save_state(pdev);

	if (retval)
@@ -5360,8 +5362,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 


	*enable_wake = !!wufc;



	ixgbe_clear_interrupt_scheme(adapter);



	ixgbe_release_hw_control(adapter);



	pci_disable_device(pdev);