From: Wolfram Sang <wsa@kernel.org>
To: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: Vaibhav Gupta <vaibhav.varodek@gmail.com>,
linux-kernel@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>,
linux-i2c@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
linux-kernel-mentees@lists.linuxfoundation.org
Subject: Re: [Linux-kernel-mentees] [PATCH v1] i2c: eg20t: use generic power management
Date: Wed, 5 Aug 2020 11:16:22 +0200 [thread overview]
Message-ID: <20200805091622.GH1229@kunai> (raw)
In-Reply-To: <20200720140031.511830-1-vaibhavgupta40@gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 3564 bytes --]
On Mon, Jul 20, 2020 at 07:30:32PM +0530, Vaibhav Gupta wrote:
> 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_enable_wake() and pci_set_power_state() 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>
Looks reasonable, but to make sure I'd like a test from someone with HW
or an ack from someone more experienced with PCI details.
> ---
> drivers/i2c/busses/i2c-eg20t.c | 39 ++++++++--------------------------
> 1 file changed, 9 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
> index 73f139690e4e..c0ddc4cc2ce7 100644
> --- a/drivers/i2c/busses/i2c-eg20t.c
> +++ b/drivers/i2c/busses/i2c-eg20t.c
> @@ -846,11 +846,10 @@ static void pch_i2c_remove(struct pci_dev *pdev)
> kfree(adap_info);
> }
>
> -#ifdef CONFIG_PM
> -static int pch_i2c_suspend(struct pci_dev *pdev, pm_message_t state)
> +static int __maybe_unused pch_i2c_suspend(struct device *dev)
> {
> - int ret;
> int i;
> + struct pci_dev *pdev = to_pci_dev(dev);
> struct adapter_info *adap_info = pci_get_drvdata(pdev);
> void __iomem *p = adap_info->pch_data[0].pch_base_address;
>
> @@ -872,34 +871,17 @@ static int pch_i2c_suspend(struct pci_dev *pdev, pm_message_t state)
> ioread32(p + PCH_I2CSR), ioread32(p + PCH_I2CBUFSTA),
> ioread32(p + PCH_I2CESRSTA));
>
> - ret = pci_save_state(pdev);
> -
> - if (ret) {
> - pch_pci_err(pdev, "pci_save_state\n");
> - return ret;
> - }
> -
> - pci_enable_wake(pdev, PCI_D3hot, 0);
> - pci_disable_device(pdev);
> - pci_set_power_state(pdev, pci_choose_state(pdev, state));
> + device_wakeup_disable(dev);
>
> return 0;
> }
>
> -static int pch_i2c_resume(struct pci_dev *pdev)
> +static int __maybe_unused pch_i2c_resume(struct device *dev)
> {
> int i;
> - struct adapter_info *adap_info = pci_get_drvdata(pdev);
> -
> - pci_set_power_state(pdev, PCI_D0);
> - pci_restore_state(pdev);
> + struct adapter_info *adap_info = dev_get_drvdata(dev);
>
> - if (pci_enable_device(pdev) < 0) {
> - pch_pci_err(pdev, "pch_i2c_resume:pci_enable_device FAILED\n");
> - return -EIO;
> - }
> -
> - pci_enable_wake(pdev, PCI_D3hot, 0);
> + device_wakeup_disable(dev);
>
> for (i = 0; i < adap_info->ch_num; i++)
> pch_i2c_init(&adap_info->pch_data[i]);
> @@ -908,18 +890,15 @@ static int pch_i2c_resume(struct pci_dev *pdev)
>
> return 0;
> }
> -#else
> -#define pch_i2c_suspend NULL
> -#define pch_i2c_resume NULL
> -#endif
> +
> +static SIMPLE_DEV_PM_OPS(pch_i2c_pm_ops, pch_i2c_suspend, pch_i2c_resume);
>
> static struct pci_driver pch_pcidriver = {
> .name = KBUILD_MODNAME,
> .id_table = pch_pcidev_id,
> .probe = pch_i2c_probe,
> .remove = pch_i2c_remove,
> - .suspend = pch_i2c_suspend,
> - .resume = pch_i2c_resume
> + .driver.pm = &pch_i2c_pm_ops,
> };
>
> module_pci_driver(pch_pcidriver);
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 201 bytes --]
_______________________________________________
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-08-05 9:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 14:00 [Linux-kernel-mentees] [PATCH v1] i2c: eg20t: use generic power management Vaibhav Gupta
2020-08-05 9:16 ` Wolfram Sang [this message]
2020-08-05 15:23 ` Bjorn Helgaas
2020-08-05 15:28 ` Bjorn Helgaas
2020-08-05 16:21 ` Vaibhav Gupta
2020-08-05 16:56 ` Bjorn Helgaas
2020-08-05 17:19 ` Vaibhav Gupta
2020-08-05 19:36 ` [Linux-kernel-mentees] [PATCH v2 0/2] i2c: eg20t: Power management upgrade and clean-ups Vaibhav Gupta
2020-08-05 19:36 ` [Linux-kernel-mentees] [PATCH v2 1/2] i2c: eg20t: Drop PCI wakeup calls from .suspend/.resume Vaibhav Gupta
2020-08-10 14:01 ` Wolfram Sang
2020-08-05 19:36 ` [Linux-kernel-mentees] [PATCH v2 2/2] i2c: eg20t: use generic power management Vaibhav Gupta
2020-08-07 20:23 ` Bjorn Helgaas
2020-08-10 9:18 ` Vaibhav Gupta
2020-08-25 9:53 ` Jean Delvare
2020-08-25 15:16 ` Bjorn Helgaas
2020-08-10 14:01 ` Wolfram Sang
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=20200805091622.GH1229@kunai \
--to=wsa@kernel.org \
--cc=bhelgaas@google.com \
--cc=helgaas@kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vaibhav.varodek@gmail.com \
--cc=vaibhavgupta40@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).