From: Greg KH <gregkh@linuxfoundation.org>
To: Prike Liang <Prike.Liang@amd.com>
Cc: linux-nvme@lists.infradead.org, kbusch@kernel.org,
Chaitanya.Kulkarni@wdc.com, hch@infradead.org,
Shyam-sundar.S-k@amd.com, Alexander.Deucher@amd.com,
"# 5 . 11+" <stable@vger.kernel.org>
Subject: Re: [PATCH 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume
Date: Wed, 14 Apr 2021 08:39:32 +0200 [thread overview]
Message-ID: <YHaOJDm3GCZ8baAV@kroah.com> (raw)
In-Reply-To: <1618381200-14856-2-git-send-email-Prike.Liang@amd.com>
On Wed, Apr 14, 2021 at 02:20:00PM +0800, Prike Liang wrote:
> The NVME device pluged in some AMD PCIE root port will resume timeout
> from s2idle which caused by NVME power CFG lost in the SMU FW restore.
> This issue can be workaround by using PCIe power set with simple
> suspend/resume process path instead of APST. In the onwards ASIC will
> try do the NVME shutdown save and restore in the BIOS and still need
> PCIe power setting to resume from RTD3 for s2idle.
>
> Update the nvme_acpi_storage_d3() _with previously added quirk.
>
> Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
> [ck: split patches for nvme and pcie]
> Signed-off-by: Prike Liang <Prike.Liang@amd.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
> Cc: <stable@vger.kernel.org> # 5.11+
> ---
> drivers/nvme/host/pci.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 6bad4d4..5a9a192 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -2832,6 +2832,7 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev)
> {
> struct acpi_device *adev;
> struct pci_dev *root;
> + struct pci_dev *rdev;
> acpi_handle handle;
> acpi_status status;
> u8 val;
> @@ -2845,6 +2846,10 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev)
> if (!root)
> return false;
>
> + rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
> + if (rdev && (rdev->dev_flags & PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND))
> + return NVME_QUIRK_SIMPLE_SUSPEND;
> +
> adev = ACPI_COMPANION(&root->dev);
> if (!adev)
> return false;
> --
> 2.7.4
>
This is still broken, why resend it?
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-04-14 6:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 6:19 [PATCH 1/2] PCI: add AMD PCIe quirk for nvme shutdown opt Prike Liang
2021-04-14 6:20 ` [PATCH 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume Prike Liang
2021-04-14 6:39 ` Greg KH [this message]
2021-04-14 7:13 ` Liang, Prike
2021-04-14 7:48 ` Greg KH
2021-04-14 8:16 ` Liang, Prike
-- strict thread matches above, loose matches on Subject: below --
2021-04-14 8:18 [PATCH 1/2] PCI: add AMD PCIe quirk for nvme shutdown opt Prike Liang
2021-04-14 8:18 ` [PATCH 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume Prike Liang
2021-04-14 8:39 ` Greg KH
2021-04-14 16:24 ` Keith Busch
2021-04-15 3:22 ` Liang, Prike
2021-04-15 3:59 ` Keith Busch
2021-04-15 6:14 ` Liang, Prike
2021-04-14 2:18 [PATCH 1/2] PCI: add AMD PCIe quirk for nvme shutdown opt Prike Liang
2021-04-14 2:18 ` [PATCH 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume Prike Liang
2021-04-14 5:34 ` Greg KH
2021-04-14 6:10 ` Liang, Prike
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=YHaOJDm3GCZ8baAV@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Alexander.Deucher@amd.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=Prike.Liang@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=hch@infradead.org \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=stable@vger.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).