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 01/15] scsi: megaraid_sas: use generic power management Date: Mon, 20 Jul 2020 19:04:14 +0530 [thread overview] Message-ID: <20200720133427.454400-2-vaibhavgupta40@gmail.com> (raw) In-Reply-To: <20200720133427.454400-1-vaibhavgupta40@gmail.com> 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 the PCI core handle the work. PCI core passes "struct device*" as an argument to the .suspend() and .resume() callbacks. As the .suspend() work with "struct instance*", extract it from "struct device*" using dev_get_drv_data(). Driver was also using PCI helper functions like pci_save/restore_state(), pci_disable/enable_device(), pci_set_power_state() and pci_enable_wake(). They should not be invoked by the driver. Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/scsi/megaraid/megaraid_sas_base.c | 61 ++++++----------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 00668335c2af..4a6ee7778977 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -7539,25 +7539,21 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, megasas_return_cmd(instance, cmd); } -#ifdef CONFIG_PM /** * megasas_suspend - driver suspend entry point - * @pdev: PCI device structure - * @state: PCI power state to suspend routine + * @dev: Device structure */ -static int -megasas_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused +megasas_suspend(struct device *dev) { - struct megasas_instance *instance; - - instance = pci_get_drvdata(pdev); + struct megasas_instance *instance = dev_get_drvdata(dev); if (!instance) return 0; instance->unload = 1; - dev_info(&pdev->dev, "%s is called\n", __func__); + dev_info(dev, "%s is called\n", __func__); /* Shutdown SR-IOV heartbeat timer */ if (instance->requestorId && !instance->skip_heartbeat_timer_del) @@ -7579,7 +7575,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) tasklet_kill(&instance->isr_tasklet); - pci_set_drvdata(instance->pdev, instance); + dev_set_drvdata(dev, instance); instance->instancet->disable_intr(instance); megasas_destroy_irqs(instance); @@ -7587,48 +7583,28 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) if (instance->msix_vectors) pci_free_irq_vectors(instance->pdev); - pci_save_state(pdev); - pci_disable_device(pdev); - - pci_set_power_state(pdev, pci_choose_state(pdev, state)); - return 0; } /** * megasas_resume- driver resume entry point - * @pdev: PCI device structure + * @dev: Device structure */ -static int -megasas_resume(struct pci_dev *pdev) +static int __maybe_unused +megasas_resume(struct device *dev) { int rval; struct Scsi_Host *host; - struct megasas_instance *instance; + struct megasas_instance *instance = dev_get_drvdata(dev); u32 status_reg; - instance = pci_get_drvdata(pdev); - if (!instance) return 0; host = instance->host; - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); + device_wakeup_disable(dev); - dev_info(&pdev->dev, "%s is called\n", __func__); - /* - * PCI prepping: enable device set bus mastering and dma mask - */ - rval = pci_enable_device_mem(pdev); - - if (rval) { - dev_err(&pdev->dev, "Enable device failed\n"); - return rval; - } - - pci_set_master(pdev); + dev_info(dev, "%s is called\n", __func__); /* * We expect the FW state to be READY @@ -7754,14 +7730,8 @@ megasas_resume(struct pci_dev *pdev) fail_set_dma_mask: fail_ready_state: - pci_disable_device(pdev); - return -ENODEV; } -#else -#define megasas_suspend NULL -#define megasas_resume NULL -#endif static inline int megasas_wait_for_adapter_operational(struct megasas_instance *instance) @@ -7931,7 +7901,7 @@ static void megasas_detach_one(struct pci_dev *pdev) /** * megasas_shutdown - Shutdown entry point - * @device: Generic device structure + * @pdev: PCI device structure */ static void megasas_shutdown(struct pci_dev *pdev) { @@ -8508,6 +8478,8 @@ static const struct file_operations megasas_mgmt_fops = { .llseek = noop_llseek, }; +static SIMPLE_DEV_PM_OPS(megasas_pm_ops, megasas_suspend, megasas_resume); + /* * PCI hotplug support registration structure */ @@ -8517,8 +8489,7 @@ static struct pci_driver megasas_pci_driver = { .id_table = megasas_pci_table, .probe = megasas_probe_one, .remove = megasas_detach_one, - .suspend = megasas_suspend, - .resume = megasas_resume, + .driver.pm = &megasas_pm_ops, .shutdown = megasas_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 01/15] scsi: megaraid_sas: use generic power management Date: Mon, 20 Jul 2020 19:04:14 +0530 [thread overview] Message-ID: <20200720133427.454400-2-vaibhavgupta40@gmail.com> (raw) In-Reply-To: <20200720133427.454400-1-vaibhavgupta40@gmail.com> 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 the PCI core handle the work. PCI core passes "struct device*" as an argument to the .suspend() and .resume() callbacks. As the .suspend() work with "struct instance*", extract it from "struct device*" using dev_get_drv_data(). Driver was also using PCI helper functions like pci_save/restore_state(), pci_disable/enable_device(), pci_set_power_state() and pci_enable_wake(). They should not be invoked by the driver. Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/scsi/megaraid/megaraid_sas_base.c | 61 ++++++----------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 00668335c2af..4a6ee7778977 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -7539,25 +7539,21 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, megasas_return_cmd(instance, cmd); } -#ifdef CONFIG_PM /** * megasas_suspend - driver suspend entry point - * @pdev: PCI device structure - * @state: PCI power state to suspend routine + * @dev: Device structure */ -static int -megasas_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused +megasas_suspend(struct device *dev) { - struct megasas_instance *instance; - - instance = pci_get_drvdata(pdev); + struct megasas_instance *instance = dev_get_drvdata(dev); if (!instance) return 0; instance->unload = 1; - dev_info(&pdev->dev, "%s is called\n", __func__); + dev_info(dev, "%s is called\n", __func__); /* Shutdown SR-IOV heartbeat timer */ if (instance->requestorId && !instance->skip_heartbeat_timer_del) @@ -7579,7 +7575,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) tasklet_kill(&instance->isr_tasklet); - pci_set_drvdata(instance->pdev, instance); + dev_set_drvdata(dev, instance); instance->instancet->disable_intr(instance); megasas_destroy_irqs(instance); @@ -7587,48 +7583,28 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) if (instance->msix_vectors) pci_free_irq_vectors(instance->pdev); - pci_save_state(pdev); - pci_disable_device(pdev); - - pci_set_power_state(pdev, pci_choose_state(pdev, state)); - return 0; } /** * megasas_resume- driver resume entry point - * @pdev: PCI device structure + * @dev: Device structure */ -static int -megasas_resume(struct pci_dev *pdev) +static int __maybe_unused +megasas_resume(struct device *dev) { int rval; struct Scsi_Host *host; - struct megasas_instance *instance; + struct megasas_instance *instance = dev_get_drvdata(dev); u32 status_reg; - instance = pci_get_drvdata(pdev); - if (!instance) return 0; host = instance->host; - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); + device_wakeup_disable(dev); - dev_info(&pdev->dev, "%s is called\n", __func__); - /* - * PCI prepping: enable device set bus mastering and dma mask - */ - rval = pci_enable_device_mem(pdev); - - if (rval) { - dev_err(&pdev->dev, "Enable device failed\n"); - return rval; - } - - pci_set_master(pdev); + dev_info(dev, "%s is called\n", __func__); /* * We expect the FW state to be READY @@ -7754,14 +7730,8 @@ megasas_resume(struct pci_dev *pdev) fail_set_dma_mask: fail_ready_state: - pci_disable_device(pdev); - return -ENODEV; } -#else -#define megasas_suspend NULL -#define megasas_resume NULL -#endif static inline int megasas_wait_for_adapter_operational(struct megasas_instance *instance) @@ -7931,7 +7901,7 @@ static void megasas_detach_one(struct pci_dev *pdev) /** * megasas_shutdown - Shutdown entry point - * @device: Generic device structure + * @pdev: PCI device structure */ static void megasas_shutdown(struct pci_dev *pdev) { @@ -8508,6 +8478,8 @@ static const struct file_operations megasas_mgmt_fops = { .llseek = noop_llseek, }; +static SIMPLE_DEV_PM_OPS(megasas_pm_ops, megasas_suspend, megasas_resume); + /* * PCI hotplug support registration structure */ @@ -8517,8 +8489,7 @@ static struct pci_driver megasas_pci_driver = { .id_table = megasas_pci_table, .probe = megasas_probe_one, .remove = megasas_detach_one, - .suspend = megasas_suspend, - .resume = megasas_resume, + .driver.pm = &megasas_pm_ops, .shutdown = megasas_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:36 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 ` Vaibhav Gupta [this message] 2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 01/15] scsi: megaraid_sas: " 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 ` [PATCH v2 13/15] scsi: 3w-sas: " Vaibhav Gupta 2020-07-20 13:34 ` [Linux-kernel-mentees] " 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-2-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.