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

Commit dd4d8ca6 authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: Use pci_wake_from_d3() instead of multiple pci_enable_wake() 



We were calling pci_enable_wake() twice in a row for both D3_hot
and D3_cold.  This replaces those calls with a call to pci_wake_from_d3()
to avoid issues with PCI PM vs ordering constraints.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7185c71

drivers/net/ixgbe/ixgbe_main.c

+6 −11
Original line number Diff line number Diff line
@@ -3738,8 +3738,7 @@ static int ixgbe_resume(struct pci_dev *pdev) 
	}

	pci_set_master(pdev);



	pci_enable_wake(pdev, PCI_D3hot, 0);

	pci_enable_wake(pdev, PCI_D3cold, 0);

	pci_wake_from_d3(pdev, false);



	err = ixgbe_init_interrupt_scheme(adapter);

	if (err) {
@@ -3813,13 +3812,10 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 
		IXGBE_WRITE_REG(hw, IXGBE_WUFC, 0);

	}



	if (wufc && hw->mac.type == ixgbe_mac_82599EB) {

		pci_enable_wake(pdev, PCI_D3hot, 1);

		pci_enable_wake(pdev, PCI_D3cold, 1);

	} else {

		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);

	}

	if (wufc && hw->mac.type == ixgbe_mac_82599EB)

		pci_wake_from_d3(pdev, true);

	else

		pci_wake_from_d3(pdev, false);



	*enable_wake = !!wufc;
@@ -5101,8 +5097,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) 
		pci_set_master(pdev);

		pci_restore_state(pdev);



		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);

		pci_wake_from_d3(pdev, false);



		ixgbe_reset(adapter);

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);