TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e100: fix device suspend/resume

Browse Source 
[ Upstream commit 5d2ca2e12d ]

As reported in [1], e100 was no longer working for suspend/resume
cycles. The previous commit mentioned in the fixes appears to have
broken things and this attempts to practice best known methods for
device power management and keep wake-up working while allowing
suspend/resume to work. To do this, I reorder a little bit of code
and fix the resume path to make sure the device is enabled.

[1] https://bugzilla.kernel.org/show_bug.cgi?id=214933

Fixes: 69a74aef8a ("e100: use generic power management")
Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Reported-by: Alexey Kuznetsov <axet@me.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Alexey Kuznetsov <axet@me.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jesse Brandeburg
2021-11-17 12:59:52 -08:00
committed by Greg Kroah-Hartman
parent 34e54703fb
commit 4e6cce20fb
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/intel/e100.c
+13 -5
View File
@@ -2997,9 +2997,10 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake)
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev); struct nic *nic = netdev_priv(netdev);
netif_device_detach(netdev);
if (netif_running(netdev)) if (netif_running(netdev))
e100_down(nic); e100_down(nic);
netif_device_detach(netdev);
if ((nic->flags & wol_magic) | e100_asf(nic)) { if ((nic->flags & wol_magic) | e100_asf(nic)) {
/* enable reverse auto-negotiation */ /* enable reverse auto-negotiation */
@@ -3016,7 +3017,7 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake)
*enable_wake = false; *enable_wake = false;
} }
pci_clear_master(pdev); pci_disable_device(pdev);
} }
static int __e100_power_off(struct pci_dev *pdev, bool wake) static int __e100_power_off(struct pci_dev *pdev, bool wake)
@@ -3036,8 +3037,6 @@ static int __maybe_unused e100_suspend(struct device *dev_d)
__e100_shutdown(to_pci_dev(dev_d), &wake); __e100_shutdown(to_pci_dev(dev_d), &wake);
device_wakeup_disable(dev_d);
return 0; return 0;
} }
@@ -3045,6 +3044,14 @@ static int __maybe_unused e100_resume(struct device *dev_d)
{ {
struct net_device *netdev = dev_get_drvdata(dev_d); struct net_device *netdev = dev_get_drvdata(dev_d);
struct nic *nic = netdev_priv(netdev); struct nic *nic = netdev_priv(netdev);
int err;
err = pci_enable_device(to_pci_dev(dev_d));
if (err) {
netdev_err(netdev, "Resume cannot enable PCI device, aborting\n");
return err;
}
pci_set_master(to_pci_dev(dev_d));
/* disable reverse auto-negotiation */ /* disable reverse auto-negotiation */
if (nic->phy == phy_82552_v) { if (nic->phy == phy_82552_v) {
@@ -3056,10 +3063,11 @@ static int __maybe_unused e100_resume(struct device *dev_d)
smartspeed & ~(E100_82552_REV_ANEG)); smartspeed & ~(E100_82552_REV_ANEG));
} }
netif_device_attach(netdev);
if (netif_running(netdev)) if (netif_running(netdev))
e100_up(nic); e100_up(nic);
netif_device_attach(netdev);
return 0; return 0;
} }