From: Vaibhav Gupta <vaibhavgupta40@gmail.com> To: Bjorn Helgaas <helgaas@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, Bjorn Helgaas <bjorn@helgaas.com>, Vaibhav Gupta <vaibhav.varodek@gmail.com>, Adam Radford <aradford@gmail.com>, "James E.J. Bottomley" <jejb@linux.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Adaptec OEM Raid Solutions <aacraid@microsemi.com>, Hannes Reinecke <hare@suse.com>, Bradley Grove <linuxdrivers@attotech.com>, John Garry <john.garry@huawei.com>, Don Brace <don.brace@microsemi.com>, James Smart <james.smart@broadcom.com>, Dick Kennedy <dick.kennedy@broadcom.com>, Kashyap Desai <kashyap.desai@broadcom.com>, Sumit Saxena <sumit.saxena@broadcom.com>, Shivasharan S <shivasharan.srikanteshwara@broadcom.com>, Sathya Prakash <sathya.prakash@broadcom.com>, Sreekanth Reddy <sreekanth.reddy@broadcom.com>, Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>, Jack Wang <jinpu.wang@cloud.ionos.com> Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>, Shuah Khan <skhan@linuxfoundation.org>, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-scsi@vger.kernel.org, esc.storagedev@microsemi.com, megaraidlinux.pdl@broadcom.com, MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH v2 13/15] scsi: 3w-sas: use generic power management Date: Mon, 20 Jul 2020 19:04:26 +0530 [thread overview] Message-ID: <20200720133427.454400-14-vaibhavgupta40@gmail.com> (raw) In-Reply-To: <20200720133427.454400-1-vaibhavgupta40@gmail.com> Drivers using legacy PM have to manage PCI states and device's PM states themselves. They also need to take care of configuration registers. With improved and powerful support of generic PM, PCI Core takes care of above mentioned, device-independent, jobs. This driver makes use of PCI helper functions like pci_save/restore_state(), pci_enable/disable_device(), pci_set_power_state() and pci_set_master() to do required operations. In generic mode, they are no longer needed. Change function parameter in both .suspend() and .resume() to "struct device*" type. Use to_pci_dev() and dev_get_drvdata() to get "struct pci_dev*" variable and drv data. Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/scsi/3w-sas.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index dda6fa857709..efaba30b0ca8 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -1756,11 +1756,10 @@ static void twl_remove(struct pci_dev *pdev) twl_device_extension_count--; } /* End twl_remove() */ -#ifdef CONFIG_PM /* This function is called on PCI suspend */ -static int twl_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused twl_suspend(struct device *dev) { - struct Scsi_Host *host = pci_get_drvdata(pdev); + struct Scsi_Host *host = dev_get_drvdata(dev); TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata; printk(KERN_WARNING "3w-sas: Suspending host %d.\n", tw_dev->host->host_no); @@ -1779,32 +1778,21 @@ static int twl_suspend(struct pci_dev *pdev, pm_message_t state) /* Clear doorbell interrupt */ TWL_CLEAR_DB_INTERRUPT(tw_dev); - pci_save_state(pdev); - pci_disable_device(pdev); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); - return 0; } /* End twl_suspend() */ /* This function is called on PCI resume */ -static int twl_resume(struct pci_dev *pdev) +static int __maybe_unused twl_resume(struct device *dev) { int retval = 0; + struct pci_dev *pdev = to_pci_dev(dev); struct Scsi_Host *host = pci_get_drvdata(pdev); TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata; printk(KERN_WARNING "3w-sas: Resuming host %d.\n", tw_dev->host->host_no); - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); - retval = pci_enable_device(pdev); - if (retval) { - TW_PRINTK(tw_dev->host, TW_DRIVER, 0x24, "Enable device failed during resume"); - return retval; - } + device_wakeup_disable(dev); - pci_set_master(pdev); pci_try_set_mwi(pdev); retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); @@ -1842,11 +1830,9 @@ static int twl_resume(struct pci_dev *pdev) out_disable_device: scsi_remove_host(host); - pci_disable_device(pdev); return retval; } /* End twl_resume() */ -#endif /* PCI Devices supported by this driver */ static struct pci_device_id twl_pci_tbl[] = { @@ -1855,16 +1841,15 @@ static struct pci_device_id twl_pci_tbl[] = { }; MODULE_DEVICE_TABLE(pci, twl_pci_tbl); +static SIMPLE_DEV_PM_OPS(twl_pm_ops, twl_suspend, twl_resume); + /* pci_driver initializer */ static struct pci_driver twl_driver = { .name = "3w-sas", .id_table = twl_pci_tbl, .probe = twl_probe, .remove = twl_remove, -#ifdef CONFIG_PM - .suspend = twl_suspend, - .resume = twl_resume, -#endif + .driver.pm = &twl_pm_ops, .shutdown = twl_shutdown }; -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Vaibhav Gupta <vaibhavgupta40@gmail.com> To: Bjorn Helgaas <helgaas@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, Bjorn Helgaas <bjorn@helgaas.com>, Vaibhav Gupta <vaibhav.varodek@gmail.com>, Adam Radford <aradford@gmail.com>, "James E.J. Bottomley" <jejb@linux.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Adaptec OEM Raid Solutions <aacraid@microsemi.com>, Hannes Reinecke <hare@suse.com>, Bradley Grove <linuxdrivers@attotech.com>, John Garry <john.garry@huawei.com>, Don Brace <don.brace@microsemi.com>, James Smart <james.smart@broadcom.com>, Dick Kennedy <dick.kennedy@broadcom.com>, Kashyap Desai <kashyap.desai@broadcom.com>, Sumit Saxena <sumit.saxena@broadcom.com>, Shivasharan S <shivasharan.srikanteshwara@broadcom.com>, Sathya Prakash <sathya.prakash@broadcom.com>, Sreekanth Reddy <sreekanth.reddy@broadcom.com>, Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>, Jack Wang <jinpu.wang@cloud.ionos.com> Cc: linux-scsi@vger.kernel.org, Vaibhav Gupta <vaibhavgupta40@gmail.com>, MPT-FusionLinux.pdl@broadcom.com, esc.storagedev@microsemi.com, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, megaraidlinux.pdl@broadcom.com Subject: [Linux-kernel-mentees] [PATCH v2 13/15] scsi: 3w-sas: use generic power management Date: Mon, 20 Jul 2020 19:04:26 +0530 [thread overview] Message-ID: <20200720133427.454400-14-vaibhavgupta40@gmail.com> (raw) In-Reply-To: <20200720133427.454400-1-vaibhavgupta40@gmail.com> Drivers using legacy PM have to manage PCI states and device's PM states themselves. They also need to take care of configuration registers. With improved and powerful support of generic PM, PCI Core takes care of above mentioned, device-independent, jobs. This driver makes use of PCI helper functions like pci_save/restore_state(), pci_enable/disable_device(), pci_set_power_state() and pci_set_master() to do required operations. In generic mode, they are no longer needed. Change function parameter in both .suspend() and .resume() to "struct device*" type. Use to_pci_dev() and dev_get_drvdata() to get "struct pci_dev*" variable and drv data. Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/scsi/3w-sas.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index dda6fa857709..efaba30b0ca8 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -1756,11 +1756,10 @@ static void twl_remove(struct pci_dev *pdev) twl_device_extension_count--; } /* End twl_remove() */ -#ifdef CONFIG_PM /* This function is called on PCI suspend */ -static int twl_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused twl_suspend(struct device *dev) { - struct Scsi_Host *host = pci_get_drvdata(pdev); + struct Scsi_Host *host = dev_get_drvdata(dev); TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata; printk(KERN_WARNING "3w-sas: Suspending host %d.\n", tw_dev->host->host_no); @@ -1779,32 +1778,21 @@ static int twl_suspend(struct pci_dev *pdev, pm_message_t state) /* Clear doorbell interrupt */ TWL_CLEAR_DB_INTERRUPT(tw_dev); - pci_save_state(pdev); - pci_disable_device(pdev); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); - return 0; } /* End twl_suspend() */ /* This function is called on PCI resume */ -static int twl_resume(struct pci_dev *pdev) +static int __maybe_unused twl_resume(struct device *dev) { int retval = 0; + struct pci_dev *pdev = to_pci_dev(dev); struct Scsi_Host *host = pci_get_drvdata(pdev); TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata; printk(KERN_WARNING "3w-sas: Resuming host %d.\n", tw_dev->host->host_no); - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); - retval = pci_enable_device(pdev); - if (retval) { - TW_PRINTK(tw_dev->host, TW_DRIVER, 0x24, "Enable device failed during resume"); - return retval; - } + device_wakeup_disable(dev); - pci_set_master(pdev); pci_try_set_mwi(pdev); retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); @@ -1842,11 +1830,9 @@ static int twl_resume(struct pci_dev *pdev) out_disable_device: scsi_remove_host(host); - pci_disable_device(pdev); return retval; } /* End twl_resume() */ -#endif /* PCI Devices supported by this driver */ static struct pci_device_id twl_pci_tbl[] = { @@ -1855,16 +1841,15 @@ static struct pci_device_id twl_pci_tbl[] = { }; MODULE_DEVICE_TABLE(pci, twl_pci_tbl); +static SIMPLE_DEV_PM_OPS(twl_pm_ops, twl_suspend, twl_resume); + /* pci_driver initializer */ static struct pci_driver twl_driver = { .name = "3w-sas", .id_table = twl_pci_tbl, .probe = twl_probe, .remove = twl_remove, -#ifdef CONFIG_PM - .suspend = twl_suspend, - .resume = twl_resume, -#endif + .driver.pm = &twl_pm_ops, .shutdown = twl_shutdown }; -- 2.27.0 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-07-20 13:38 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-20 13:34 [PATCH v2 00/15] scsi: use generic power management Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 01/15] scsi: megaraid_sas: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 16:57 ` Vaibhav Gupta 2020-09-08 16:57 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:32 ` Bjorn Helgaas 2020-09-08 17:32 ` [Linux-kernel-mentees] " Bjorn Helgaas 2020-09-09 10:03 ` Vaibhav Gupta 2020-09-09 10:03 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-09 13:23 ` Bjorn Helgaas 2020-09-09 13:23 ` [Linux-kernel-mentees] " Bjorn Helgaas 2020-09-09 15:20 ` Vaibhav Gupta 2020-09-09 15:20 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-09 16:21 ` Bjorn Helgaas 2020-09-09 16:21 ` [Linux-kernel-mentees] " Bjorn Helgaas 2020-07-20 13:34 ` [PATCH v2 02/15] scsi: aacraid: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-23 6:58 ` Balsundar.P 2020-07-23 6:58 ` [Linux-kernel-mentees] " Balsundar.P--- via Linux-kernel-mentees 2020-09-08 16:58 ` Vaibhav Gupta 2020-09-08 16:58 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 03/15] scsi: aic7xxx: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 16:59 ` Vaibhav Gupta 2020-09-08 16:59 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 04/15] scsi: aic79xx: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 16:59 ` Vaibhav Gupta 2020-09-08 16:59 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 05/15] scsi: arcmsr: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:00 ` Vaibhav Gupta 2020-09-08 17:00 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 06/15] scsi: esas2r: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:01 ` Vaibhav Gupta 2020-09-08 17:01 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 07/15] scsi: hisi_sas_v3_hw: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-21 1:36 ` chenxiang (M) 2020-07-21 1:36 ` [Linux-kernel-mentees] " chenxiang (M) 2020-09-08 17:02 ` Vaibhav Gupta 2020-09-08 17:02 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 08/15] scsi: mpt3sas_scsih: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:03 ` Vaibhav Gupta 2020-09-08 17:03 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 09/15] scsi: lpfc: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:03 ` Vaibhav Gupta 2020-09-08 17:03 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 10/15] scsi: pm_8001: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-23 7:02 ` Jinpu Wang 2020-07-23 7:02 ` [Linux-kernel-mentees] " Jinpu Wang 2020-09-08 17:04 ` Vaibhav Gupta 2020-09-08 17:04 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 11/15] scsi: hpsa: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 22:23 ` Don.Brace 2020-07-20 22:23 ` [Linux-kernel-mentees] " Don.Brace--- via Linux-kernel-mentees 2020-09-08 17:05 ` Vaibhav Gupta 2020-09-08 17:05 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 12/15] scsi: 3w-9xxx: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:05 ` Vaibhav Gupta 2020-09-08 17:05 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` Vaibhav Gupta [this message] 2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 13/15] scsi: 3w-sas: " Vaibhav Gupta 2020-09-08 17:06 ` Vaibhav Gupta 2020-09-08 17:06 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 14/15] scsi: mvumi: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:07 ` Vaibhav Gupta 2020-09-08 17:07 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:34 ` [PATCH v2 15/15] scsi: pmcraid: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 17:08 ` Vaibhav Gupta 2020-09-08 17:08 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-08-17 8:16 ` [PATCH v2 00/15] scsi: " Vaibhav Gupta 2020-08-17 8:16 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-09-08 16:54 ` Vaibhav Gupta 2020-09-08 16:54 ` [Linux-kernel-mentees] " Vaibhav Gupta
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200720133427.454400-14-vaibhavgupta40@gmail.com \ --to=vaibhavgupta40@gmail.com \ --cc=MPT-FusionLinux.pdl@broadcom.com \ --cc=aacraid@microsemi.com \ --cc=aradford@gmail.com \ --cc=bhelgaas@google.com \ --cc=bjorn@helgaas.com \ --cc=dick.kennedy@broadcom.com \ --cc=don.brace@microsemi.com \ --cc=esc.storagedev@microsemi.com \ --cc=hare@suse.com \ --cc=helgaas@kernel.org \ --cc=james.smart@broadcom.com \ --cc=jejb@linux.ibm.com \ --cc=jinpu.wang@cloud.ionos.com \ --cc=john.garry@huawei.com \ --cc=kashyap.desai@broadcom.com \ --cc=linux-kernel-mentees@lists.linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=linuxdrivers@attotech.com \ --cc=martin.petersen@oracle.com \ --cc=megaraidlinux.pdl@broadcom.com \ --cc=sathya.prakash@broadcom.com \ --cc=shivasharan.srikanteshwara@broadcom.com \ --cc=skhan@linuxfoundation.org \ --cc=sreekanth.reddy@broadcom.com \ --cc=suganath-prabu.subramani@broadcom.com \ --cc=sumit.saxena@broadcom.com \ --cc=vaibhav.varodek@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.