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.

In this preparation patch add a PCIe quirk for the AMD.

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 Cc: stable@vger.kernel.org # 5.11+ --- drivers/pci/quirks.c | 10 ++++++++++ include/linux/pci.h | 3 +++ 2 files changed, 13 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3ba9e..f95c8b2de25a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -312,6 +312,16 @@ static void quirk_nopciamd(struct pci_dev *dev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8151_0, quirk_nopciamd);

+static void quirk_amd_nvme_fixup(struct pci_dev *dev) +{ + struct pci_dev *rdev; + + dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND; + pci_info(dev, "AMD simple suspend opt enabled\n"); + +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1630, quirk_amd_nvme_fixup); + /* Triton requires workarounds to be used by the drivers */ static void quirk_triton(struct pci_dev *dev) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 86c799c97b77..cebc49e87707 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -227,6 +227,9 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10), /* Don't use Relaxed Ordering for TLPs directed at this device */ PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11), + /* AMD simple suspend opt quirk */ + PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND = + (__force pci_dev_flags_t) (1 << 12), };

enum pci_irq_reroute_variant {