From: Bjorn Helgaas <helgaas@kernel.org>
To: Jon Derrick <jonathan.derrick@intel.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
linux-pci@vger.kernel.org,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
You-Sheng Yang <vicamo.yang@canonical.com>,
Vaibhav Gupta <vaibhavgupta40@gmail.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Subject: Re: [PATCH] PCI: vmd: Allow VMD PM to use PCI core PM code
Date: Wed, 5 Aug 2020 10:09:07 -0500 [thread overview]
Message-ID: <20200805150907.GA510270@bjorn-Precision-5520> (raw)
In-Reply-To: <20200731171544.6155-1-jonathan.derrick@intel.com>
[+cc Vaibhav, Rafael for suspend/resume question]
On Fri, Jul 31, 2020 at 01:15:44PM -0400, Jon Derrick wrote:
> The pci_save_state call in vmd_suspend can be performed by
> pci_pm_suspend_irq. This allows the call to pci_prepare_to_sleep into
> ASPM flow.
Add "()" after function names so they don't look like English words.
What is this "ASPM flow"? The only ASPM-related code should be
configuration (enable/disable ASPM) (which happens at
enumeration-time, not suspend/resume time) and save/restore if we turn
the device off and we have to reconfigure it when we turn it on again.
> The pci_restore_state call in vmd_resume was restoring state after
> pci_pm_resume->pci_restore_standard_config had already restored state.
> It's also been suspected that the config state should be restored before
> re-requesting IRQs.
>
> Remove the pci_{save,restore}_state calls in vmd_{suspend,resume} in
> order to allow proper flow through PCI core power management ASPM code.
>
> Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Cc: You-Sheng Yang <vicamo.yang@canonical.com>
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
> ---
> drivers/pci/controller/vmd.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index 76d8acbee7d5..15c1d85d8780 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -719,7 +719,6 @@ static int vmd_suspend(struct device *dev)
> for (i = 0; i < vmd->msix_count; i++)
> devm_free_irq(dev, pci_irq_vector(pdev, i), &vmd->irqs[i]);
>
> - pci_save_state(pdev);
The VMD driver uses generic PM, not legacy PCI PM, so I think removing
the save/restore state from your suspend/resume functions is the right
thing to do. You should only need to do VMD-specific things there.
I'm not even sure you need to free/request the IRQs in your
suspend/resume. Maybe Rafael or Vaibhav know.
I just think the justification in the commit log is wrong.
> return 0;
> }
>
> @@ -737,7 +736,6 @@ static int vmd_resume(struct device *dev)
> return err;
> }
>
> - pci_restore_state(pdev);
> return 0;
> }
> #endif
> --
> 2.18.1
>
next prev parent reply other threads:[~2020-08-05 16:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 17:15 [PATCH] PCI: vmd: Allow VMD PM to use PCI core PM code Jon Derrick
2020-08-05 7:54 ` You-Sheng Yang
2020-08-05 15:30 ` Derrick, Jonathan
2020-08-05 15:35 ` Bjorn Helgaas
2020-08-05 15:09 ` Bjorn Helgaas [this message]
2020-08-05 16:09 ` Derrick, Jonathan
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=20200805150907.GA510270@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=jonathan.derrick@intel.com \
--cc=kai.heng.feng@canonical.com \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
--cc=vaibhavgupta40@gmail.com \
--cc=vicamo.yang@canonical.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).