UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

e100: use generic power management 

With legacy PM hooks, it was the responsibility of a driver to manage PCI
states and also the device's power state. The generic approach is to let
PCI core handle the work.

e100_suspend() calls __e100_shutdown() to perform intermediate tasks.
__e100_shutdown() calls pci_save_state() which is not recommended.

e100_suspend() also calls __e100_power_off() which is calling PCI helper
functions, pci_prepare_to_sleep(), pci_set_power_state(), along with
pci_wake_from_d3(...,false). Hence, the functin call is removed and wol is
disabled as earlier using device_wakeup_disable().

Compile-tested only.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Vaibhav Gupta 2020-06-29 14:59:43 +05:30 committed by Tony Nguyen
parent bac6631728
commit 69a74aef8a
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/ethernet/intel/e100.c
View File

@ -2993,8 +2993,6 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake)
e100_down(nic); e100_down(nic);
netif_device_detach(netdev); netif_device_detach(netdev);
pci_save_state(pdev);
if ((nic->flags & wol_magic) | e100_asf(nic)) { if ((nic->flags & wol_magic) | e100_asf(nic)) {
/* enable reverse auto-negotiation */ /* enable reverse auto-negotiation */
if (nic->phy == phy_82552_v) { if (nic->phy == phy_82552_v) {
@ -3024,24 +3022,22 @@ static int __e100_power_off(struct pci_dev *pdev, bool wake)
return 0; return 0;
} }
#ifdef CONFIG_PM static int __maybe_unused e100_suspend(struct device *dev_d)
static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
bool wake; bool wake;
__e100_shutdown(pdev, &wake);
return __e100_power_off(pdev, wake); __e100_shutdown(to_pci_dev(dev_d), &wake);
device_wakeup_disable(dev_d);
return 0;
} }
static int e100_resume(struct pci_dev *pdev) static int __maybe_unused e100_resume(struct device *dev_d)
{ {
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = dev_get_drvdata(dev_d);
struct nic *nic = netdev_priv(netdev); struct nic *nic = netdev_priv(netdev);
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
/* ack any pending wake events, disable PME */
pci_enable_wake(pdev, PCI_D0, 0);
/* disable reverse auto-negotiation */ /* disable reverse auto-negotiation */
if (nic->phy == phy_82552_v) { if (nic->phy == phy_82552_v) {
u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, u16 smartspeed = mdio_read(netdev, nic->mii.phy_id,
@ -3058,7 +3054,6 @@ static int e100_resume(struct pci_dev *pdev)
return 0; return 0;
} }
#endif /* CONFIG_PM */
static void e100_shutdown(struct pci_dev *pdev) static void e100_shutdown(struct pci_dev *pdev)
{ {
@ -3146,16 +3141,17 @@ static const struct pci_error_handlers e100_err_handler = {
.resume = e100_io_resume, .resume = e100_io_resume,
}; };
static SIMPLE_DEV_PM_OPS(e100_pm_ops, e100_suspend, e100_resume);
static struct pci_driver e100_driver = { static struct pci_driver e100_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = e100_id_table, .id_table = e100_id_table,
.probe = e100_probe, .probe = e100_probe,
.remove = e100_remove, .remove = e100_remove,
#ifdef CONFIG_PM
/* Power Management hooks */ /* Power Management hooks */
.suspend = e100_suspend, .driver.pm = &e100_pm_ops,
.resume = e100_resume,
#endif
.shutdown = e100_shutdown, .shutdown = e100_shutdown,
.err_handler = &e100_err_handler, .err_handler = &e100_err_handler,
}; };