From: rafael@kernel.org (Rafael J. Wysocki)
Subject: [PATCH] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled
Date: Thu, 8 Aug 2019 11:06:17 +0200 [thread overview]
Message-ID: <CAJZ5v0hTJKPi1zfB_RjuZ415-JjmK2nVP7mss3npqoB3+Xvy4w@mail.gmail.com> (raw)
In-Reply-To: <20190808084804.GA31404@lst.de>
On Thu, Aug 8, 2019@10:48 AM Christoph Hellwig <hch@lst.de> wrote:
>
> > - ndev->last_ps = 0;
> > ret = nvme_get_power_state(ctrl, &ndev->last_ps);
> > - if (ret < 0)
> > + if (ret < 0 || ndev->last_ps == U32_MAX)
>
> Is the intent of the magic U32_MAX check to see if the
> nvme_get_power_state failed at the nvme level? In that case just
> checking for any non-zero return value from nvme_get_power_state might
> be the easier and more clear way to do it.
Now that I think of that, it appears redundant. I'll drop it.
>
> > Index: linux-pm/drivers/pci/pcie/aspm.c
> > ===================================================================
> > --- linux-pm.orig/drivers/pci/pcie/aspm.c
> > +++ linux-pm/drivers/pci/pcie/aspm.c
>
> Shouldn't we split PCI vs nvme in two patches?
That can be done.
> > @@ -1170,6 +1170,26 @@ static int pcie_aspm_get_policy(char *bu
> > module_param_call(policy, pcie_aspm_set_policy, pcie_aspm_get_policy,
> > NULL, 0644);
> >
> > +/*
> > + * pcie_aspm_enabled - Return the mask of enabled ASPM link states.
> > + * @pci_device: Target device.
> > + */
> > +u32 pcie_aspm_enabled(struct pci_dev *pci_device)
>
> pcie_aspm_enabled sounds like it returns a boolean. Shouldn't there be
> a mask or so in the name better documenting what it returns?
OK
> > +{
> > + struct pci_dev *bridge = pci_upstream_bridge(pci_device);
> > + u32 ret;
> > +
> > + if (!bridge)
> > + return 0;
> > +
> > + mutex_lock(&aspm_lock);
> > + ret = bridge->link_state ? bridge->link_state->aspm_enabled : 0;
> > + mutex_unlock(&aspm_lock);
> > +
> > + return ret;
> > +}
>
> I think this will need a EXPORT_SYMBOL_GPL thrown in so that modular
> nvme continues working.
Right, sorry.
> > +
> > +
> > #ifdef CONFIG_PCIEASPM_DEBUG
>
> Nit: double blank line here.
Overlooked, will fix.
Thanks!
next prev parent reply other threads:[~2019-08-08 9:06 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 9:51 [Regression] Commit "nvme/pci: Use host managed power state for suspend" has problems Rafael J. Wysocki
2019-07-25 14:02 ` Kai-Heng Feng
2019-07-25 16:23 ` Mario.Limonciello
2019-07-25 17:03 ` Rafael J. Wysocki
2019-07-25 17:23 ` Mario.Limonciello
2019-07-25 18:20 ` Kai-Heng Feng
2019-07-25 19:09 ` Mario.Limonciello
2019-07-30 10:45 ` Rafael J. Wysocki
2019-07-30 14:41 ` Keith Busch
2019-07-30 17:14 ` Mario.Limonciello
2019-07-30 18:50 ` Kai-Heng Feng
2019-07-30 19:19 ` Keith Busch
2019-07-30 21:05 ` Mario.Limonciello
2019-07-30 21:31 ` Keith Busch
2019-07-31 21:25 ` Rafael J. Wysocki
2019-07-31 22:19 ` Keith Busch
2019-07-31 22:33 ` Rafael J. Wysocki
2019-08-01 9:05 ` Kai-Heng Feng
2019-08-01 17:29 ` Rafael J. Wysocki
2019-08-01 19:05 ` Mario.Limonciello
2019-08-01 22:26 ` Rafael J. Wysocki
2019-08-02 10:55 ` Kai-Heng Feng
2019-08-02 11:04 ` Rafael J. Wysocki
2019-08-05 19:13 ` Kai-Heng Feng
2019-08-05 21:28 ` Rafael J. Wysocki
2019-08-06 14:02 ` Mario.Limonciello
2019-08-06 15:00 ` Rafael J. Wysocki
2019-08-07 10:29 ` Rafael J. Wysocki
2019-08-01 20:22 ` Keith Busch
2019-08-07 9:48 ` Rafael J. Wysocki
2019-08-07 10:45 ` Christoph Hellwig
2019-08-07 10:54 ` Rafael J. Wysocki
2019-08-07 9:53 ` [PATCH] nvme-pci: Do not prevent PCI bus-level PM from being used Rafael J. Wysocki
2019-08-07 10:14 ` Rafael J. Wysocki
2019-08-07 10:43 ` Christoph Hellwig
2019-08-07 14:37 ` Keith Busch
2019-08-08 8:36 ` [PATCH] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Rafael J. Wysocki
2019-08-08 8:48 ` Christoph Hellwig
2019-08-08 9:06 ` Rafael J. Wysocki [this message]
2019-08-08 10:03 ` [PATCH v2 0/2] " Rafael J. Wysocki
2019-08-08 10:06 ` [PATCH v2 1/2] PCI: PCIe: ASPM: Introduce pcie_aspm_enabled_mask() Rafael J. Wysocki
2019-08-08 13:15 ` Bjorn Helgaas
2019-08-08 14:48 ` Rafael J. Wysocki
2019-08-08 10:10 ` [PATCH v2 2/2] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Rafael J. Wysocki
2019-08-08 13:43 ` Bjorn Helgaas
2019-08-08 14:47 ` Rafael J. Wysocki
2019-08-08 17:06 ` Rafael J. Wysocki
2019-08-08 18:39 ` Bjorn Helgaas
2019-08-08 20:01 ` Keith Busch
2019-08-08 20:05 ` Mario.Limonciello
2019-08-08 20:41 ` Rafael J. Wysocki
2019-08-09 4:47 ` Bjorn Helgaas
2019-08-09 8:04 ` Rafael J. Wysocki
2019-08-08 21:51 ` [PATCH v3 0/2] " Rafael J. Wysocki
2019-08-08 21:55 ` [PATCH v3 1/2] PCI: PCIe: ASPM: Introduce pcie_aspm_enabled() Rafael J. Wysocki
2019-08-09 4:50 ` Bjorn Helgaas
2019-08-09 8:00 ` Rafael J. Wysocki
2019-10-07 22:34 ` Bjorn Helgaas
2019-10-08 9:27 ` Rafael J. Wysocki
2019-10-08 21:16 ` Bjorn Helgaas
2019-10-08 22:54 ` Rafael J. Wysocki
2019-10-09 12:49 ` Bjorn Helgaas
2019-08-08 21:58 ` [PATCH v3 2/2] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Rafael J. Wysocki
2019-08-08 22:13 ` [PATCH v3 0/2] " Keith Busch
2019-08-09 8:05 ` Rafael J. Wysocki
2019-08-09 14:52 ` Keith Busch
2019-07-25 16:59 ` [Regression] Commit "nvme/pci: Use host managed power state for suspend" has problems Rafael J. Wysocki
2019-07-25 14:52 ` Keith Busch
2019-07-25 19:48 ` Rafael J. Wysocki
2019-07-25 19:52 ` Keith Busch
2019-07-25 20:02 ` Rafael J. Wysocki
2019-07-26 14:02 ` Kai-Heng Feng
2019-07-27 12:55 ` Rafael J. Wysocki
2019-07-29 15:51 ` Mario.Limonciello
2019-07-29 22:05 ` Rafael J. Wysocki
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=CAJZ5v0hTJKPi1zfB_RjuZ415-JjmK2nVP7mss3npqoB3+Xvy4w@mail.gmail.com \
--to=rafael@kernel.org \
/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).