mirror of
https://github.com/torvalds/linux.git
synced 2024-10-30 16:51:45 +00:00
[PATCH] e1000: Fix regression: garbled stats and irq allocation during swsusp
e1000: Fix suspend/resume powerup and irq allocation From: Auke Kok <auke-jan.h.kok@intel.com> After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled device showing garbled statistics and undetermined irq allocation state, where `ifconfig eth0 down` would display `trying to free already freed irq`. Explicitly free and allocate irq as well as powerup the PHY during resume fixes when needed. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
e78181feb0
commit
edd106fc8a
@ -4800,6 +4800,9 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
|
||||
if (adapter->hw.phy_type == e1000_phy_igp_3)
|
||||
e1000_phy_powerdown_workaround(&adapter->hw);
|
||||
|
||||
if (netif_running(netdev))
|
||||
e1000_free_irq(adapter);
|
||||
|
||||
/* Release control of h/w to f/w. If f/w is AMT enabled, this
|
||||
* would have already happened in close and is redundant. */
|
||||
e1000_release_hw_control(adapter);
|
||||
@ -4830,6 +4833,10 @@ e1000_resume(struct pci_dev *pdev)
|
||||
pci_enable_wake(pdev, PCI_D3hot, 0);
|
||||
pci_enable_wake(pdev, PCI_D3cold, 0);
|
||||
|
||||
if (netif_running(netdev) && (err = e1000_request_irq(adapter)))
|
||||
return err;
|
||||
|
||||
e1000_power_up_phy(adapter);
|
||||
e1000_reset(adapter);
|
||||
E1000_WRITE_REG(&adapter->hw, WUS, ~0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user