From: Bjorn Helgaas <helgaas@kernel.org>
To: Daniel Drake <drake@endlessm.com>
Cc: linux-pci@vger.kernel.org, rafael.j.wysocki@intel.com,
linux@endlessm.com, linux-pm@vger.kernel.org,
linux-usb@vger.kernel.org, mika.westerberg@linux.intel.com
Subject: Re: [PATCH v2 1/2] PCI: add generic quirk function for increasing D3hot delay
Date: Fri, 13 Dec 2019 15:04:45 -0600 [thread overview]
Message-ID: <20191213210445.GA199960@google.com> (raw)
In-Reply-To: <20191127053836.31624-1-drake@endlessm.com>
On Wed, Nov 27, 2019 at 01:38:35PM +0800, Daniel Drake wrote:
> Separate the D3 delay increase functionality out of quirk_radeon_pm() into
> its own function so that it can be shared with other quirks, including
> the AMD Ryzen XHCI quirk that will be introduced in a followup commit.
>
> Tweak the function name and message to indicate more clearly that the
> delay relates to a D3hot-to-D0 transition.
>
> Signed-off-by: Daniel Drake <drake@endlessm.com>
I applied both of these to pci/misc for v5.6, thanks!
> ---
> drivers/pci/quirks.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> v2: tweaked function name and message to emphasize D3hot state
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 320255e5e8f89..3b4021e719530 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -1871,16 +1871,21 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x2609, quirk_intel_pcie_pm);
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260a, quirk_intel_pcie_pm);
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x260b, quirk_intel_pcie_pm);
>
> +static void quirk_d3hot_delay(struct pci_dev *dev, unsigned int delay)
> +{
> + if (dev->d3_delay >= delay)
> + return;
> +
> + dev->d3_delay = delay;
> + pci_info(dev, "extending delay after power-on from D3hot to %d msec\n",
> + dev->d3_delay);
> +}
> +
> static void quirk_radeon_pm(struct pci_dev *dev)
> {
> if (dev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&
> - dev->subsystem_device == 0x00e2) {
> - if (dev->d3_delay < 20) {
> - dev->d3_delay = 20;
> - pci_info(dev, "extending delay after power-on from D3 to %d msec\n",
> - dev->d3_delay);
> - }
> - }
> + dev->subsystem_device == 0x00e2)
> + quirk_d3hot_delay(dev, 20);
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6741, quirk_radeon_pm);
>
> --
> 2.20.1
>
prev parent reply other threads:[~2019-12-13 21:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 5:38 [PATCH v2 1/2] PCI: add generic quirk function for increasing D3hot delay Daniel Drake
2019-11-27 5:38 ` [PATCH v2 2/2] PCI: increase D3 delay for AMD Ryzen5/7 XHCI controllers Daniel Drake
2019-11-27 11:50 ` Mika Westerberg
2019-11-27 11:50 ` [PATCH v2 1/2] PCI: add generic quirk function for increasing D3hot delay Mika Westerberg
2019-12-12 9:51 ` Daniel Drake
2019-12-13 21:04 ` Bjorn Helgaas [this message]
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=20191213210445.GA199960@google.com \
--to=helgaas@kernel.org \
--cc=drake@endlessm.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@endlessm.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.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).