Message ID | 20091222204456.14196.63456.stgit@localhost.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Tue, 22 Dec 2009 12:45:20 -0800 > From: Don Skidmore <donald.c.skidmore@intel.com> > > This patch adds a pci_save_state() call in ixgbe_resume() after > pci_restore_state(). A similar change was made in ixgbe_io_slot_reset() > that accommodates pci_restore_state() new behavior. This change makes > pci_restore_state() clear the saved_state flag This is necessary due > to a resent kernel change to pci_restore_state() so that it now clears > the saved_state flag of the device right after the device.s standard > configuration registers have been poplulated with the previously saved > values. > > Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index bd64387..1a2ea62 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -4373,6 +4373,11 @@ static int ixgbe_resume(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); + /* + * pci_restore_state clears dev->state_saved so call + * pci_save_state to restore it. + */ + pci_save_state(pdev); err = pci_enable_device_mem(pdev); if (err) {