diff options
| author | David Ertman <david.m.ertman@intel.com> | 2014-07-11 06:21:23 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-07-25 21:08:12 -0700 |
| commit | 2116bc25e8aefd76503dfa2fc328eb8da684bb38 (patch) | |
| tree | e9f2c7b9069d3a845834d61ef41e068e7c842afa /drivers/net/ethernet/intel/e1000e | |
| parent | b4c1e6bf1c8522a6c6c8f29226a1e2cf126431df (diff) | |
| download | op-kernel-dev-2116bc25e8aefd76503dfa2fc328eb8da684bb38.zip op-kernel-dev-2116bc25e8aefd76503dfa2fc328eb8da684bb38.tar.gz | |
e1000e: Fix EEE in S5 w/ Runtime PM enabled
The process of shutting down the system causes a call to the close PM
callback. The reset in close causes a loss of link, and the resultant
LSC interrupt causes the Runtime PM idle callback to be called. The
check for link (while link is down) in the idle callback is wiping the
information about the EEE ability of the link partner. The information is
still gone when the PHY is powered back up in the shutdown flow. This
causes EEE in S5 to fail when Runtime PM is active.
Save the link partner's EEE ability in the idle callback so that a Runtime
PM event will not cause a loss of this information.
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index fe3e42a..1ce0d74 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6357,9 +6357,14 @@ static int e1000e_pm_runtime_idle(struct device *dev) struct pci_dev *pdev = to_pci_dev(dev); struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev_priv(netdev); + u16 eee_lp; - if (!e1000e_has_link(adapter)) + eee_lp = adapter->hw.dev_spec.ich8lan.eee_lp_ability; + + if (!e1000e_has_link(adapter)) { + adapter->hw.dev_spec.ich8lan.eee_lp_ability = eee_lp; pm_schedule_suspend(dev, 5 * MSEC_PER_SEC); + } return -EBUSY; } |
