3.6.11.4 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Konstantin Khlebnikov <[email protected]>
[ Upstream commit 66148babe728f3e00e13c56f6b0ecf325abd80da ]
This patch removes redundant actions from driver and fixes its interaction
with actions in pci-bus runtime power management code.
It removes pci_save_state() from __e1000_shutdown() for normal adapters,
PCI bus callbacks pci_pm_*() will do all this for us. Now __e1000_shutdown()
switches to D3-state only quad-port adapters, because they needs quirk for
clearing false-positive error from downsteam pci-e port.
pci_save_state() now called after clearing bus-master bit, thus __e1000_resume()
and e1000_io_slot_reset() must set it back after restoring configuration space.
This patch set get_link_status before calling pm_runtime_put() in e1000_open()
to allow e1000_idle() get real link status and schedule first runtime suspend.
This patch also enables wakeup for device if management mode is enabled
(like for WoL) as result pci_prepare_to_sleep() would setup wakeup without
special actions like custom 'enable_wakeup' sign.
Cc: Bruce Allan <[email protected]>
Signed-off-by: Konstantin Khlebnikov <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
Tested-by: Borislav Petkov <[email protected]>
Tested-by: Aaron Brown <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 78 +++++++---------------------
1 file changed, 18 insertions(+), 60 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a46e75e..d191a63 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3951,6 +3951,7 @@ static int e1000_open(struct net_device *netdev)
netif_start_queue(netdev);
adapter->idle_check = true;
+ hw->mac.get_link_status = true;
pm_runtime_put(&pdev->dev);
/* fire a link status change interrupt to start the watchdog */
@@ -5454,8 +5455,7 @@ release:
return retval;
}
-static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
- bool runtime)
+static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -5479,10 +5479,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
}
e1000e_reset_interrupt_capability(adapter);
- retval = pci_save_state(pdev);
- if (retval)
- return retval;
-
status = er32(STATUS);
if (status & E1000_STATUS_LU)
wufc &= ~E1000_WUFC_LNKC;
@@ -5538,13 +5534,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
ew32(WUFC, 0);
}
- *enable_wake = !!wufc;
-
- /* make sure adapter isn't asleep if manageability is enabled */
- if ((adapter->flags & FLAG_MNG_PT_ENABLED) ||
- (hw->mac.ops.check_mng_mode(hw)))
- *enable_wake = true;
-
if (adapter->hw.phy.type == e1000_phy_igp_3)
e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
@@ -5556,26 +5545,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
pci_disable_device(pdev);
- return 0;
-}
-
-static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)
-{
- if (sleep && wake) {
- pci_prepare_to_sleep(pdev);
- return;
- }
-
- pci_wake_from_d3(pdev, wake);
- pci_set_power_state(pdev, PCI_D3hot);
-}
-
-static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
- bool wake)
-{
- struct net_device *netdev = pci_get_drvdata(pdev);
- struct e1000_adapter *adapter = netdev_priv(netdev);
-
/*
* The pci-e switch on some quad port adapters will report a
* correctable error when the MAC transitions from D0 to D3. To
@@ -5591,12 +5560,13 @@ static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL,
(devctl & ~PCI_EXP_DEVCTL_CERE));
- e1000_power_off(pdev, sleep, wake);
+ pci_save_state(pdev);
+ pci_prepare_to_sleep(pdev);
pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL, devctl);
- } else {
- e1000_power_off(pdev, sleep, wake);
}
+
+ return 0;
}
#ifdef CONFIG_PCIEASPM
@@ -5658,9 +5628,7 @@ static int __e1000_resume(struct pci_dev *pdev)
if (aspm_disable_flag)
e1000e_disable_aspm(pdev, aspm_disable_flag);
- pci_set_power_state(pdev, PCI_D0);
- pci_restore_state(pdev);
- pci_save_state(pdev);
+ pci_set_master(pdev);
e1000e_set_interrupt_capability(adapter);
if (netif_running(netdev)) {
@@ -5727,14 +5695,8 @@ static int __e1000_resume(struct pci_dev *pdev)
static int e1000_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
- int retval;
- bool wake;
-
- retval = __e1000_shutdown(pdev, &wake, false);
- if (!retval)
- e1000_complete_shutdown(pdev, true, wake);
- return retval;
+ return __e1000_shutdown(pdev, false);
}
static int e1000_resume(struct device *dev)
@@ -5757,13 +5719,10 @@ static int e1000_runtime_suspend(struct device *dev)
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
- if (e1000e_pm_ready(adapter)) {
- bool wake;
-
- __e1000_shutdown(pdev, &wake, true);
- }
+ if (!e1000e_pm_ready(adapter))
+ return 0;
- return 0;
+ return __e1000_shutdown(pdev, true);
}
static int e1000_idle(struct device *dev)
@@ -5801,12 +5760,7 @@ static int e1000_runtime_resume(struct device *dev)
static void e1000_shutdown(struct pci_dev *pdev)
{
- bool wake = false;
-
- __e1000_shutdown(pdev, &wake, false);
-
- if (system_state == SYSTEM_POWER_OFF)
- e1000_complete_shutdown(pdev, false, wake);
+ __e1000_shutdown(pdev, false);
}
#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -5924,9 +5878,9 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
"Cannot re-enable PCI device after reset.\n");
result = PCI_ERS_RESULT_DISCONNECT;
} else {
- pci_set_master(pdev);
pdev->state_saved = true;
pci_restore_state(pdev);
+ pci_set_master(pdev);
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);
@@ -6363,7 +6317,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
/* initialize the wol settings based on the eeprom settings */
adapter->wol = adapter->eeprom_wol;
- device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
+ /* make sure adapter isn't asleep if manageability is enabled */
+ if (adapter->wol || (adapter->flags & FLAG_MNG_PT_ENABLED) ||
+ (hw->mac.ops.check_mng_mode(hw)))
+ device_wakeup_enable(&pdev->dev);
/* save off EEPROM version number */
e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
--
1.7.10.4
Steven Rostedt wrote:
> 3.6.11.4 stable review patch.
> If anyone has any objections, please let me know.
I don't think that 3.6.y needs this. That was fix for problem which appeared
in 3.8 after some changes in PCI power management code. Probably it depends
on these changes. If no one complains about problems we should leave it as is.
>
> ------------------
>
> From: Konstantin Khlebnikov<[email protected]>
>
> [ Upstream commit 66148babe728f3e00e13c56f6b0ecf325abd80da ]
>
> This patch removes redundant actions from driver and fixes its interaction
> with actions in pci-bus runtime power management code.
>
> It removes pci_save_state() from __e1000_shutdown() for normal adapters,
> PCI bus callbacks pci_pm_*() will do all this for us. Now __e1000_shutdown()
> switches to D3-state only quad-port adapters, because they needs quirk for
> clearing false-positive error from downsteam pci-e port.
>
> pci_save_state() now called after clearing bus-master bit, thus __e1000_resume()
> and e1000_io_slot_reset() must set it back after restoring configuration space.
>
> This patch set get_link_status before calling pm_runtime_put() in e1000_open()
> to allow e1000_idle() get real link status and schedule first runtime suspend.
>
> This patch also enables wakeup for device if management mode is enabled
> (like for WoL) as result pci_prepare_to_sleep() would setup wakeup without
> special actions like custom 'enable_wakeup' sign.
>
> Cc: Bruce Allan<[email protected]>
> Signed-off-by: Konstantin Khlebnikov<[email protected]>
> Acked-by: Rafael J. Wysocki<[email protected]>
> Tested-by: Borislav Petkov<[email protected]>
> Tested-by: Aaron Brown<[email protected]>
> Signed-off-by: Jeff Kirsher<[email protected]>
> Signed-off-by: Steven Rostedt<[email protected]>
On Sat, 2013-05-18 at 09:35 +0400, Konstantin Khlebnikov wrote:
> Steven Rostedt wrote:
> > 3.6.11.4 stable review patch.
> > If anyone has any objections, please let me know.
>
> I don't think that 3.6.y needs this. That was fix for problem which appeared
> in 3.8 after some changes in PCI power management code. Probably it depends
> on these changes. If no one complains about problems we should leave it as is.
My thoughts are the same as Konstantin, but I would like Bruce Allan to
weigh in on this since he is the e1000e maintainer. Since it is late
Friday night, Bruce probably won't see this until Monday to respond.
> >
> > ------------------
> >
> > From: Konstantin Khlebnikov<[email protected]>
> >
> > [ Upstream commit 66148babe728f3e00e13c56f6b0ecf325abd80da ]
> >
> > This patch removes redundant actions from driver and fixes its interaction
> > with actions in pci-bus runtime power management code.
> >
> > It removes pci_save_state() from __e1000_shutdown() for normal adapters,
> > PCI bus callbacks pci_pm_*() will do all this for us. Now __e1000_shutdown()
> > switches to D3-state only quad-port adapters, because they needs quirk for
> > clearing false-positive error from downsteam pci-e port.
> >
> > pci_save_state() now called after clearing bus-master bit, thus __e1000_resume()
> > and e1000_io_slot_reset() must set it back after restoring configuration space.
> >
> > This patch set get_link_status before calling pm_runtime_put() in e1000_open()
> > to allow e1000_idle() get real link status and schedule first runtime suspend.
> >
> > This patch also enables wakeup for device if management mode is enabled
> > (like for WoL) as result pci_prepare_to_sleep() would setup wakeup without
> > special actions like custom 'enable_wakeup' sign.
> >
> > Cc: Bruce Allan<[email protected]>
> > Signed-off-by: Konstantin Khlebnikov<[email protected]>
> > Acked-by: Rafael J. Wysocki<[email protected]>
> > Tested-by: Borislav Petkov<[email protected]>
> > Tested-by: Aaron Brown<[email protected]>
> > Signed-off-by: Jeff Kirsher<[email protected]>
> > Signed-off-by: Steven Rostedt<[email protected]>
>
On Fri, 2013-05-17 at 22:40 -0700, Jeff Kirsher wrote:
> On Sat, 2013-05-18 at 09:35 +0400, Konstantin Khlebnikov wrote:
> > Steven Rostedt wrote:
> > > 3.6.11.4 stable review patch.
> > > If anyone has any objections, please let me know.
> >
> > I don't think that 3.6.y needs this. That was fix for problem which appeared
> > in 3.8 after some changes in PCI power management code. Probably it depends
> > on these changes. If no one complains about problems we should leave it as is.
>
> My thoughts are the same as Konstantin, but I would like Bruce Allan to
> weigh in on this since he is the e1000e maintainer. Since it is late
> Friday night, Bruce probably won't see this until Monday to respond.
Any word on this? I'll wait till tomorrow to do the release. If I don't
hear anything, then I may just remove it.
Thanks,
-- Steve
>
> > >
> > > ------------------
> > >
> > > From: Konstantin Khlebnikov<[email protected]>
> > >
> > > [ Upstream commit 66148babe728f3e00e13c56f6b0ecf325abd80da ]
> > >
> > > This patch removes redundant actions from driver and fixes its interaction
> > > with actions in pci-bus runtime power management code.
> > >
> > > It removes pci_save_state() from __e1000_shutdown() for normal adapters,
> > > PCI bus callbacks pci_pm_*() will do all this for us. Now __e1000_shutdown()
> > > switches to D3-state only quad-port adapters, because they needs quirk for
> > > clearing false-positive error from downsteam pci-e port.
> > >
> > > pci_save_state() now called after clearing bus-master bit, thus __e1000_resume()
> > > and e1000_io_slot_reset() must set it back after restoring configuration space.
> > >
> > > This patch set get_link_status before calling pm_runtime_put() in e1000_open()
> > > to allow e1000_idle() get real link status and schedule first runtime suspend.
> > >
> > > This patch also enables wakeup for device if management mode is enabled
> > > (like for WoL) as result pci_prepare_to_sleep() would setup wakeup without
> > > special actions like custom 'enable_wakeup' sign.
> > >
> > > Cc: Bruce Allan<[email protected]>
> > > Signed-off-by: Konstantin Khlebnikov<[email protected]>
> > > Acked-by: Rafael J. Wysocki<[email protected]>
> > > Tested-by: Borislav Petkov<[email protected]>
> > > Tested-by: Aaron Brown<[email protected]>
> > > Signed-off-by: Jeff Kirsher<[email protected]>
> > > Signed-off-by: Steven Rostedt<[email protected]>
> >
>
>
On Mon, 2013-05-20 at 15:35 -0400, Steven Rostedt wrote:
> On Fri, 2013-05-17 at 22:40 -0700, Jeff Kirsher wrote:
> > On Sat, 2013-05-18 at 09:35 +0400, Konstantin Khlebnikov wrote:
> > > Steven Rostedt wrote:
> > > > 3.6.11.4 stable review patch.
> > > > If anyone has any objections, please let me know.
> > >
> > > I don't think that 3.6.y needs this. That was fix for problem which appeared
> > > in 3.8 after some changes in PCI power management code. Probably it depends
> > > on these changes. If no one complains about problems we should leave it as is.
> >
> > My thoughts are the same as Konstantin, but I would like Bruce Allan to
> > weigh in on this since he is the e1000e maintainer. Since it is late
> > Friday night, Bruce probably won't see this until Monday to respond.
>
> Any word on this? I'll wait till tomorrow to do the release. If I don't
> hear anything, then I may just remove it.
>
> Thanks,
>
> -- Steve
>
Drop it from the release please.
Cheers,
Jeff
> >
> > > >
> > > > ------------------
> > > >
> > > > From: Konstantin Khlebnikov<[email protected]>
> > > >
> > > > [ Upstream commit 66148babe728f3e00e13c56f6b0ecf325abd80da ]
> > > >
> > > > This patch removes redundant actions from driver and fixes its interaction
> > > > with actions in pci-bus runtime power management code.
> > > >
> > > > It removes pci_save_state() from __e1000_shutdown() for normal adapters,
> > > > PCI bus callbacks pci_pm_*() will do all this for us. Now __e1000_shutdown()
> > > > switches to D3-state only quad-port adapters, because they needs quirk for
> > > > clearing false-positive error from downsteam pci-e port.
> > > >
> > > > pci_save_state() now called after clearing bus-master bit, thus __e1000_resume()
> > > > and e1000_io_slot_reset() must set it back after restoring configuration space.
> > > >
> > > > This patch set get_link_status before calling pm_runtime_put() in e1000_open()
> > > > to allow e1000_idle() get real link status and schedule first runtime suspend.
> > > >
> > > > This patch also enables wakeup for device if management mode is enabled
> > > > (like for WoL) as result pci_prepare_to_sleep() would setup wakeup without
> > > > special actions like custom 'enable_wakeup' sign.
> > > >
> > > > Cc: Bruce Allan<[email protected]>
> > > > Signed-off-by: Konstantin Khlebnikov<[email protected]>
> > > > Acked-by: Rafael J. Wysocki<[email protected]>
> > > > Tested-by: Borislav Petkov<[email protected]>
> > > > Tested-by: Aaron Brown<[email protected]>
> > > > Signed-off-by: Jeff Kirsher<[email protected]>
> > > > Signed-off-by: Steven Rostedt<[email protected]>
> > >
> >
> >
>
>
On Mon, 2013-05-20 at 13:24 -0700, Jeff Kirsher wrote:
> Drop it from the release please.
>
Will do, thanks.
-- Steve