From: Keith Busch <kbusch@kernel.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: "Busch, Keith" <keith.busch@intel.com>,
Mario Limonciello <Mario.Limonciello@dell.com>,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme <linux-nvme@lists.infradead.org>,
Linux PM <linux-pm@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rajat Jain <rajatja@google.com>
Subject: Re: [Regression] Commit "nvme/pci: Use host managed power state for suspend" has problems
Date: Tue, 30 Jul 2019 08:41:35 -0600 [thread overview]
Message-ID: <20190730144134.GA12844@localhost.localdomain> (raw)
In-Reply-To: <47415939.KV5G6iaeJG@kreacher>
On Tue, Jul 30, 2019 at 03:45:31AM -0700, Rafael J. Wysocki wrote:
> So I can reproduce this problem with plain 5.3-rc1 and the patch below fixes it.
>
> Also Mario reports that the same patch needs to be applied for his 9380 to reach
> SLP_S0 after some additional changes under testing/review now, so here it goes.
>
> [The changes mentioned above are in the pm-s2idle-testing branch in the
> linux-pm.git tree at kernel.org.]
>
> ---
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: [PATCH] nvme-pci: Do not prevent PCI bus-level PM from being used
>
> One of the modifications made by commit d916b1be94b6 ("nvme-pci: use
> host managed power state for suspend") was adding a pci_save_state()
> call to nvme_suspend() in order to prevent the PCI bus-level PM from
> being applied to the suspended NVMe devices, but that causes the NVMe
> drive (PC401 NVMe SK hynix 256GB) in my Dell XPS13 9380 to prevent
> the SoC from reaching package idle states deeper than PC3, which is
> way insufficient for system suspend.
>
> Fix this issue by removing the pci_save_state() call in question.
I'm okay with the patch if we can get confirmation this doesn't break
any previously tested devices. I recall we add the pci_save_state() in
the first place specifically to prevent PCI D3 since that was reported
to break some devices' low power settings. Kai-Heng or Mario, any input
here?
> Fixes: d916b1be94b6 ("nvme-pci: use host managed power state for suspend")
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> drivers/nvme/host/pci.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> Index: linux-pm/drivers/nvme/host/pci.c
> ===================================================================
> --- linux-pm.orig/drivers/nvme/host/pci.c
> +++ linux-pm/drivers/nvme/host/pci.c
> @@ -2897,14 +2897,8 @@ static int nvme_suspend(struct device *d
> nvme_dev_disable(ndev, true);
> ctrl->npss = 0;
> ret = 0;
> - goto unfreeze;
> }
> - /*
> - * A saved state prevents pci pm from generically controlling the
> - * device's power. If we're using protocol specific settings, we don't
> - * want pci interfering.
> - */
> - pci_save_state(pdev);
> +
> unfreeze:
> nvme_unfreeze(ctrl);
> return ret;
next prev parent reply other threads:[~2019-07-30 14:44 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 [this message]
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
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=20190730144134.GA12844@localhost.localdomain \
--to=kbusch@kernel.org \
--cc=Mario.Limonciello@dell.com \
--cc=hch@lst.de \
--cc=kai.heng.feng@canonical.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=rajatja@google.com \
--cc=rjw@rjwysocki.net \
--cc=sagi@grimberg.me \
/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).