| Message ID | 20200702063632.289959-3-vaibhavgupta40@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | David Miller |
| Headers | show |
| Series | qlogic: use generic power management | expand |
On 02/07/2020 9:36 am, Vaibhav Gupta wrote: > External Email > > ---------------------------------------------------------------------- > With legacy PM, drivers themselves were responsible for managing the > device's power states and takes care of register states. And they use PCI > helper functions to do it. > > After upgrading to the generic structure, PCI core will take care of > required tasks and drivers should do only device-specific operations. > > .suspend() calls __qlcnic_shutdown, which then calls qlcnic_82xx_shutdown; > .resume() calls __qlcnic_resume, which then calls qlcnic_82xx_resume; > > Both ...82xx..() are define in > drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c and are used only in > drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c. > > Hence upgrade them and remove PCI function calls, like pci_save_state() > and > pci_enable_wake(), inside them > > Compile-tested only. > > Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> Acked-by: Igor Russkikh <irusskikh@marvell.com> Thanks!
On Thu, 2 Jul 2020 12:06:32 +0530 Vaibhav Gupta wrote: > With legacy PM, drivers themselves were responsible for managing the > device's power states and takes care of register states. And they use PCI > helper functions to do it. > > After upgrading to the generic structure, PCI core will take care of > required tasks and drivers should do only device-specific operations. > > .suspend() calls __qlcnic_shutdown, which then calls qlcnic_82xx_shutdown; > .resume() calls __qlcnic_resume, which then calls qlcnic_82xx_resume; > > Both ...82xx..() are define in > drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c and are used only in > drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c. > > Hence upgrade them and remove PCI function calls, like pci_save_state() and > pci_enable_wake(), inside them > > Compile-tested only. > > Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c: In function ‘qlcnic_82xx_shutdown’: drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c:1652:6: warning: unused variable ‘retval’ [-Wunused-variable] 1652 | int retval; | ^~~~~~
On Thu, Jul 2, 2020 at 10:06 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Thu, 2 Jul 2020 12:06:32 +0530 Vaibhav Gupta wrote: > > With legacy PM, drivers themselves were responsible for managing the > > device's power states and takes care of register states. And they use PCI > > helper functions to do it. > > > > After upgrading to the generic structure, PCI core will take care of > > required tasks and drivers should do only device-specific operations. > > > > .suspend() calls __qlcnic_shutdown, which then calls qlcnic_82xx_shutdown; > > .resume() calls __qlcnic_resume, which then calls qlcnic_82xx_resume; > > > > Both ...82xx..() are define in > > drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c and are used only in > > drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c. > > > > Hence upgrade them and remove PCI function calls, like pci_save_state() and > > pci_enable_wake(), inside them > > > > Compile-tested only. > > > > Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> > > drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c: In function ‘qlcnic_82xx_shutdown’: > drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c:1652:6: warning: unused variable ‘retval’ [-Wunused-variable] > 1652 | int retval; > | ^~~~~~ Fixed in v2. Thanks! --Vaibhav Gupta
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 822aa393c370..780bba9f2e92 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c @@ -1662,14 +1662,8 @@ int qlcnic_82xx_shutdown(struct pci_dev *pdev) clear_bit(__QLCNIC_RESETTING, &adapter->state); - retval = pci_save_state(pdev); - if (retval) - return retval; - - if (qlcnic_wol_supported(adapter)) { - pci_enable_wake(pdev, PCI_D3cold, 1); - pci_enable_wake(pdev, PCI_D3hot, 1); - } + if (qlcnic_wol_supported(adapter)) + device_wakeup_enable(&pdev->dev); return 0; } diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 9dd6cb36f366..e52af092a793 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2811,35 +2811,17 @@ static void qlcnic_shutdown(struct pci_dev *pdev) pci_disable_device(pdev); } -#ifdef CONFIG_PM -static int qlcnic_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused qlcnic_suspend(struct device *dev_d) { - int retval; - - retval = __qlcnic_shutdown(pdev); - if (retval) - return retval; - - pci_set_power_state(pdev, pci_choose_state(pdev, state)); - return 0; + return __qlcnic_shutdown(to_pci_dev(dev_d)); } -static int qlcnic_resume(struct pci_dev *pdev) +static int __maybe_unused qlcnic_resume(struct device *dev_d) { - struct qlcnic_adapter *adapter = pci_get_drvdata(pdev); - int err; - - err = pci_enable_device(pdev); - if (err) - return err; - - pci_set_power_state(pdev, PCI_D0); - pci_set_master(pdev); - pci_restore_state(pdev); + struct qlcnic_adapter *adapter = dev_get_drvdata(dev_d); return __qlcnic_resume(adapter); } -#endif static int qlcnic_open(struct net_device *netdev) { @@ -4258,15 +4240,14 @@ static const struct pci_error_handlers qlcnic_err_handler = { .resume = qlcnic_io_resume, }; +static SIMPLE_DEV_PM_OPS(qlcnic_pm_ops, qlcnic_suspend, qlcnic_resume); + static struct pci_driver qlcnic_driver = { .name = qlcnic_driver_name, .id_table = qlcnic_pci_tbl, .probe = qlcnic_probe, .remove = qlcnic_remove, -#ifdef CONFIG_PM - .suspend = qlcnic_suspend, - .resume = qlcnic_resume, -#endif + .driver.pm = &qlcnic_pm_ops, .shutdown = qlcnic_shutdown, .err_handler = &qlcnic_err_handler, #ifdef CONFIG_QLCNIC_SRIOV
With legacy PM, drivers themselves were responsible for managing the device's power states and takes care of register states. And they use PCI helper functions to do it. After upgrading to the generic structure, PCI core will take care of required tasks and drivers should do only device-specific operations. .suspend() calls __qlcnic_shutdown, which then calls qlcnic_82xx_shutdown; .resume() calls __qlcnic_resume, which then calls qlcnic_82xx_resume; Both ...82xx..() are define in drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c and are used only in drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c. Hence upgrade them and remove PCI function calls, like pci_save_state() and pci_enable_wake(), inside them Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- .../net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 10 ++---- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 33 ++++--------------- 2 files changed, 9 insertions(+), 34 deletions(-)