nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path
PATCH v3 1/1 nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path
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.
---
Changes in v2:
Fix the patch format and check chip root complex DID instead of PCIe RP to avoid the storage device plugged in internal PCIe RP by USB adaptor.
Changes in v3:
According to Christoph Hellwig do NVME PCIe related identify opt better in PCIe quirk driver rather than in NVME module.
---drivers/nvme/host/pci.c | 5 +++++
drivers/pci/quirks.c | 11 +++++++++++ include/linux/pci.h | 2 ++ include/linux/pci_ids.h | 2 ++ 4 files changed, 20 insertions(+)
drivers/nvme/host/pci.c +5 -0
@@ -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->dev_flags &PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND ) +return NVME_QUIRK_SIMPLE_SUSPEND ; + adev =ACPI_COMPANION (&root->dev);if (!adev)return false;
drivers/pci/quirks.c +11 -0
@@ -312,6 +312,17 @@ 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 ,PCI_DEVICE_ID_AMD_CZN_RP , quirk_amd_nvme_fixup); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_RN_RP , quirk_amd_nvme_fixup); +/* Triton requires workarounds to be used by the drivers */ static void quirk_triton (struct pci_dev *dev) {
include/linux/pci.h +2 -0
@@ -227,6 +227,8 @@ 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 {
include/linux/pci_ids.h +2 -0
@@ -602,6 +602,8 @@#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b#define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c#define PCI_DEVICE_ID_AMD_KERNCZ_SMBUS 0x790b +#define PCI_DEVICE_ID_AMD_CZN_RP 0x1630 +#define PCI_DEVICE_ID_AMD_RN_RP PCI_DEVICE_ID_AMD_CZN_RP#define PCI_VENDOR_ID_TRIDENT 0x1023#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
Signature · 7 lines
2.7.4 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 9 lines · Prike Liang
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.
Signed-off-by Prike Liang <[email protected]>Signed-off-by Shyam Sundar S K <[email protected]>
Looks good.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerPlease split the PCI part and nvme part into two patches and make sure to include the PCI maintainer and mailing list.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme