From: Bjorn Helgaas <helgaas@kernel.org>
To: Vaibhav Gupta <vaibhavgupta40@gmail.com>
Cc: linux-pm@vger.kernel.org, linux-pci@vger.kernel.org,
Martin Habets <mhabets@solarflare.com>,
rjw@rjwysocki.net, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
Shannon Nelson <snelson@pensando.io>,
linux-kernel-mentees@lists.linuxfoundation.org,
Heiner Kallweit <hkallweit1@gmail.com>
Subject: Re: [Linux-kernel-mentees] [PATCH v2 2/2] realtek/8139cp: Remove Legacy Power Management
Date: Tue, 28 Apr 2020 12:29:17 -0500 [thread overview]
Message-ID: <20200428172917.GA177492@google.com> (raw)
In-Reply-To: <20200428144314.24533-3-vaibhavgupta40@gmail.com>
On Tue, Apr 28, 2020 at 08:13:14PM +0530, Vaibhav Gupta wrote:
> Upgrade power management from legacy to generic using dev_pm_ops.
>
> Add "__maybe_unused" attribute to resume() and susend() callbacks
> definition to suppress compiler warnings.
>
> Generic callback requires an argument of type "struct device*". Hence,
> convert it to "struct net_device*" using "dev_get_drv_data()" to use
> it in the callback.
>
> Most of the cleaning part is to remove pci_save_state(),
> pci_set_power_state(), etc power management function calls.
>
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
> ---
> drivers/net/ethernet/realtek/8139cp.c | 25 +++++++------------------
> 1 file changed, 7 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
> index 60d342f82fb3..4f2fb1393966 100644
> --- a/drivers/net/ethernet/realtek/8139cp.c
> +++ b/drivers/net/ethernet/realtek/8139cp.c
> @@ -2054,10 +2054,9 @@ static void cp_remove_one (struct pci_dev *pdev)
> free_netdev(dev);
> }
>
> -#ifdef CONFIG_PM
> -static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
> +static int __maybe_unused cp_suspend(struct device *device)
> {
> - struct net_device *dev = pci_get_drvdata(pdev);
> + struct net_device *dev = dev_get_drvdata(device);
> struct cp_private *cp = netdev_priv(dev);
> unsigned long flags;
>
> @@ -2075,16 +2074,12 @@ static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
>
> spin_unlock_irqrestore (&cp->lock, flags);
>
> - pci_save_state(pdev);
> - pci_enable_wake(pdev, pci_choose_state(pdev, state), cp->wol_enabled);
This one is a little more interesting because it relies on the driver
state (cp->wol_enabled). IIUC, the corresponding pci_enable_wake() in
the generic path is in pci_prepare_to_sleep() (called from
pci_pm_suspend_noirq()).
But of course the generic path doesn't look at cp->wol_enabled. It
looks at device_may_wakeup(), but I don't know whether there's a
connection between that and cp->wol_enabled.
> - pci_set_power_state(pdev, pci_choose_state(pdev, state));
> -
> return 0;
> }
>
> -static int cp_resume (struct pci_dev *pdev)
> +static int __maybe_unused cp_resume(struct device *device)
> {
> - struct net_device *dev = pci_get_drvdata (pdev);
> + struct net_device *dev = dev_get_drvdata(device);
> struct cp_private *cp = netdev_priv(dev);
> unsigned long flags;
>
> @@ -2093,10 +2088,6 @@ static int cp_resume (struct pci_dev *pdev)
>
> netif_device_attach (dev);
>
> - pci_set_power_state(pdev, PCI_D0);
> - pci_restore_state(pdev);
> - pci_enable_wake(pdev, PCI_D0, 0);
> -
> /* FIXME: sh*t may happen if the Rx ring buffer is depleted */
> cp_init_rings_index (cp);
> cp_init_hw (cp);
> @@ -2111,7 +2102,6 @@ static int cp_resume (struct pci_dev *pdev)
>
> return 0;
> }
> -#endif /* CONFIG_PM */
>
> static const struct pci_device_id cp_pci_tbl[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },
> @@ -2120,15 +2110,14 @@ static const struct pci_device_id cp_pci_tbl[] = {
> };
> MODULE_DEVICE_TABLE(pci, cp_pci_tbl);
>
> +static SIMPLE_DEV_PM_OPS(cp_pm_ops, cp_suspend, cp_resume);
> +
> static struct pci_driver cp_driver = {
> .name = DRV_NAME,
> .id_table = cp_pci_tbl,
> .probe = cp_init_one,
> .remove = cp_remove_one,
> -#ifdef CONFIG_PM
> - .resume = cp_resume,
> - .suspend = cp_suspend,
> -#endif
> + .driver.pm = &cp_pm_ops,
> };
>
> module_pci_driver(cp_driver);
> --
> 2.26.2
>
_______________________________________________
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-04-28 17:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 14:43 [Linux-kernel-mentees] [PATCH v2 0/2] realtek ethernet : remove legacy power management callbacks Vaibhav Gupta
2020-04-28 14:43 ` [Linux-kernel-mentees] [PATCH v2 1/2] realtek/8139too: Remove Legacy Power Management Vaibhav Gupta
2020-04-28 17:19 ` Bjorn Helgaas
[not found] ` <CAPBsFfDjVSRHjf36WcAgteH9XocrmrNYTPW4fD2Rwi0neJF6ww@mail.gmail.com>
2020-04-29 14:41 ` Vaibhav Gupta
2020-04-28 14:43 ` [Linux-kernel-mentees] [PATCH v2 2/2] realtek/8139cp: " Vaibhav Gupta
2020-04-28 17:29 ` Bjorn Helgaas [this message]
2020-04-29 14:32 ` Vaibhav Gupta
2020-04-28 17:54 ` [Linux-kernel-mentees] [PATCH v2 0/2] realtek ethernet : remove legacy power management callbacks Heiner Kallweit
2020-04-29 14:23 ` Vaibhav Gupta
-- strict thread matches above, loose matches on Subject: below --
2020-04-25 7:15 Vaibhav Gupta
2020-04-25 7:15 ` [Linux-kernel-mentees] [PATCH v2 2/2] realtek/8139cp: Remove Legacy Power Management 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=20200428172917.GA177492@google.com \
--to=helgaas@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mhabets@solarflare.com \
--cc=netdev@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=snelson@pensando.io \
--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).