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>, Jens Axboe <axboe@kernel.dk>, Joshua Morris <josh.h.morris@us.ibm.com>, Philip Kelleher <pjk1939@linux.ibm.com>, Damien Le Moal <Damien.LeMoal@wdc.com> Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Shuah Khan <skhan@linuxfoundation.org> Subject: [PATCH v2 3/3] skd: use generic power management Date: Mon, 20 Jul 2020 19:00:02 +0530 [thread overview] Message-ID: <20200720133002.448809-4-vaibhavgupta40@gmail.com> (raw) In-Reply-To: <20200720133002.448809-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_request/release_regions(), 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() to get "struct pci_dev*" variable. Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/block/skd_main.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 51569c199a6c..7f2d42900b38 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -3315,10 +3315,11 @@ static void skd_pci_remove(struct pci_dev *pdev) return; } -static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused skd_pci_suspend(struct device *dev) { int i; struct skd_device *skdev; + struct pci_dev *pdev = to_pci_dev(dev); skdev = pci_get_drvdata(pdev); if (!skdev) { @@ -3337,18 +3338,15 @@ static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state) if (skdev->pcie_error_reporting_is_enabled) pci_disable_pcie_error_reporting(pdev); - pci_release_regions(pdev); - pci_save_state(pdev); - pci_disable_device(pdev); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); return 0; } -static int skd_pci_resume(struct pci_dev *pdev) +static int __maybe_unused skd_pci_resume(struct device *dev) { int i; int rc = 0; struct skd_device *skdev; + struct pci_dev *pdev = to_pci_dev(dev); skdev = pci_get_drvdata(pdev); if (!skdev) { @@ -3356,16 +3354,8 @@ static int skd_pci_resume(struct pci_dev *pdev) return -1; } - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); + device_wakeup_disable(dev); - rc = pci_enable_device(pdev); - if (rc) - return rc; - rc = pci_request_regions(pdev, DRV_NAME); - if (rc) - goto err_out; rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (rc) rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); @@ -3374,7 +3364,6 @@ static int skd_pci_resume(struct pci_dev *pdev) goto err_out_regions; } - pci_set_master(pdev); rc = pci_enable_pcie_error_reporting(pdev); if (rc) { dev_err(&pdev->dev, @@ -3427,10 +3416,6 @@ static int skd_pci_resume(struct pci_dev *pdev) pci_disable_pcie_error_reporting(pdev); err_out_regions: - pci_release_regions(pdev); - -err_out: - pci_disable_device(pdev); return rc; } @@ -3450,13 +3435,14 @@ static void skd_pci_shutdown(struct pci_dev *pdev) skd_stop_device(skdev); } +static SIMPLE_DEV_PM_OPS(skd_pci_pm_ops, skd_pci_suspend, skd_pci_resume); + static struct pci_driver skd_driver = { .name = DRV_NAME, .id_table = skd_pci_tbl, .probe = skd_pci_probe, .remove = skd_pci_remove, - .suspend = skd_pci_suspend, - .resume = skd_pci_resume, + .driver.pm = &skd_pci_pm_ops, .shutdown = skd_pci_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>, Jens Axboe <axboe@kernel.dk>, Joshua Morris <josh.h.morris@us.ibm.com>, Philip Kelleher <pjk1939@linux.ibm.com>, Damien Le Moal <Damien.LeMoal@wdc.com> Cc: linux-block@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, Vaibhav Gupta <vaibhavgupta40@gmail.com> Subject: [Linux-kernel-mentees] [PATCH v2 3/3] skd: use generic power management Date: Mon, 20 Jul 2020 19:00:02 +0530 [thread overview] Message-ID: <20200720133002.448809-4-vaibhavgupta40@gmail.com> (raw) In-Reply-To: <20200720133002.448809-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_request/release_regions(), 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() to get "struct pci_dev*" variable. Compile-tested only. Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/block/skd_main.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 51569c199a6c..7f2d42900b38 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -3315,10 +3315,11 @@ static void skd_pci_remove(struct pci_dev *pdev) return; } -static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused skd_pci_suspend(struct device *dev) { int i; struct skd_device *skdev; + struct pci_dev *pdev = to_pci_dev(dev); skdev = pci_get_drvdata(pdev); if (!skdev) { @@ -3337,18 +3338,15 @@ static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state) if (skdev->pcie_error_reporting_is_enabled) pci_disable_pcie_error_reporting(pdev); - pci_release_regions(pdev); - pci_save_state(pdev); - pci_disable_device(pdev); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); return 0; } -static int skd_pci_resume(struct pci_dev *pdev) +static int __maybe_unused skd_pci_resume(struct device *dev) { int i; int rc = 0; struct skd_device *skdev; + struct pci_dev *pdev = to_pci_dev(dev); skdev = pci_get_drvdata(pdev); if (!skdev) { @@ -3356,16 +3354,8 @@ static int skd_pci_resume(struct pci_dev *pdev) return -1; } - pci_set_power_state(pdev, PCI_D0); - pci_enable_wake(pdev, PCI_D0, 0); - pci_restore_state(pdev); + device_wakeup_disable(dev); - rc = pci_enable_device(pdev); - if (rc) - return rc; - rc = pci_request_regions(pdev, DRV_NAME); - if (rc) - goto err_out; rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (rc) rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); @@ -3374,7 +3364,6 @@ static int skd_pci_resume(struct pci_dev *pdev) goto err_out_regions; } - pci_set_master(pdev); rc = pci_enable_pcie_error_reporting(pdev); if (rc) { dev_err(&pdev->dev, @@ -3427,10 +3416,6 @@ static int skd_pci_resume(struct pci_dev *pdev) pci_disable_pcie_error_reporting(pdev); err_out_regions: - pci_release_regions(pdev); - -err_out: - pci_disable_device(pdev); return rc; } @@ -3450,13 +3435,14 @@ static void skd_pci_shutdown(struct pci_dev *pdev) skd_stop_device(skdev); } +static SIMPLE_DEV_PM_OPS(skd_pci_pm_ops, skd_pci_suspend, skd_pci_resume); + static struct pci_driver skd_driver = { .name = DRV_NAME, .id_table = skd_pci_tbl, .probe = skd_pci_probe, .remove = skd_pci_remove, - .suspend = skd_pci_suspend, - .resume = skd_pci_resume, + .driver.pm = &skd_pci_pm_ops, .shutdown = skd_pci_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:32 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-17 8:09 [PATCH v1 0/3] block: use generic power management Vaibhav Gupta 2020-07-17 8:09 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-17 8:09 ` [PATCH v1 1/3] mtip32xx: " Vaibhav Gupta 2020-07-17 8:09 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-17 8:09 ` [PATCH v1 2/3] rsxx: " Vaibhav Gupta 2020-07-17 8:09 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-17 8:09 ` [PATCH v1 3/3] skd: " Vaibhav Gupta 2020-07-17 8:09 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 12:52 ` Damien Le Moal 2020-07-20 12:52 ` [Linux-kernel-mentees] " Damien Le Moal 2020-07-20 13:16 ` Vaibhav Gupta 2020-07-20 13:16 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-21 2:49 ` Damien Le Moal 2020-07-21 2:49 ` [Linux-kernel-mentees] " Damien Le Moal 2020-07-21 7:04 ` Vaibhav Gupta 2020-07-21 7:04 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:29 ` [PATCH v2 0/3] block: " Vaibhav Gupta 2020-07-20 13:29 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:30 ` [PATCH v2 1/3] mtip32xx: " Vaibhav Gupta 2020-07-20 13:30 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:30 ` [PATCH v2 2/3] rsxx: " Vaibhav Gupta 2020-07-20 13:30 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-20 13:30 ` Vaibhav Gupta [this message] 2020-07-20 13:30 ` [Linux-kernel-mentees] [PATCH v2 3/3] skd: " Vaibhav Gupta 2020-07-21 2:57 ` Damien Le Moal 2020-07-21 2:57 ` [Linux-kernel-mentees] " Damien Le Moal 2020-07-21 7:09 ` Vaibhav Gupta 2020-07-21 7:09 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-22 6:28 ` Damien Le Moal 2020-07-22 6:28 ` [Linux-kernel-mentees] " Damien Le Moal 2020-07-22 7:21 ` Vaibhav Gupta 2020-07-22 7:21 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-22 8:33 ` [PATCH v3 0/3] block: " Vaibhav Gupta 2020-07-22 8:33 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-22 8:33 ` [PATCH v3 1/3] mtip32xx: " Vaibhav Gupta 2020-07-22 8:33 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-22 8:33 ` [PATCH v3 2/3] rsxx: " Vaibhav Gupta 2020-07-22 8:33 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-22 8:33 ` [PATCH v3 3/3] skd: " Vaibhav Gupta 2020-07-22 8:33 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-27 2:14 ` Damien Le Moal 2020-07-27 2:14 ` [Linux-kernel-mentees] " Damien Le Moal 2020-08-17 7:55 ` [PATCH v3 0/3] block: " Vaibhav Gupta 2020-08-17 7:55 ` [Linux-kernel-mentees] " Vaibhav Gupta 2021-01-14 11:54 ` [PATCH v4 " Vaibhav Gupta 2021-01-14 11:54 ` [Linux-kernel-mentees] " Vaibhav Gupta 2021-01-14 11:54 ` [PATCH v4 1/3] mtip32xx: " Vaibhav Gupta 2021-01-14 11:54 ` [Linux-kernel-mentees] " Vaibhav Gupta 2021-01-14 11:54 ` [PATCH v4 2/3] rsxx: " Vaibhav Gupta 2021-01-14 11:54 ` [Linux-kernel-mentees] " Vaibhav Gupta 2021-01-14 11:54 ` [PATCH v4 3/3] skd: " Vaibhav Gupta 2021-01-14 11:54 ` [Linux-kernel-mentees] " Vaibhav Gupta 2020-07-22 17:52 ` [PATCH v2 " Bjorn Helgaas 2020-07-22 17:52 ` [Linux-kernel-mentees] " Bjorn Helgaas 2020-07-22 18:07 ` Vaibhav Gupta 2020-07-22 18:07 ` [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=20200720133002.448809-4-vaibhavgupta40@gmail.com \ --to=vaibhavgupta40@gmail.com \ --cc=Damien.LeMoal@wdc.com \ --cc=axboe@kernel.dk \ --cc=bhelgaas@google.com \ --cc=bjorn@helgaas.com \ --cc=helgaas@kernel.org \ --cc=josh.h.morris@us.ibm.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel-mentees@lists.linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pjk1939@linux.ibm.com \ --cc=skhan@linuxfoundation.org \ --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.