ixgbe: Use pci_wake_from_d3() instead of multiple pci_enable_wake()
Subsystems (2)
PATCH 1/1 ixgbe: Use pci_wake_from_d3() instead of multiple pci_enable_wake()
From: Don Skidmore <[email protected]>
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 Don Skidmore <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/ixgbe/ixgbe_main.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +6 -11
@@ -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 );
From: Jeff Kirsher <[email protected]>
Date: Wed, 29 Apr 2009 00:18:52 -0700
Quoted 6 lines
We were calling
pci_enable_wake()twice in a row for bothD3_hotandD3_cold. This replaces those calls with a call topci_wake_from_d3()to avoid issues with PCI PM vs ordering constraints.Signed-off-by Don Skidmore <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.