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
Reviewed-by: Chaitanya Kulkarni chaitanya.kulkarni@wdc.com Cc: stable@vger.kernel.org # 5.11+ --- drivers/pci/quirks.c | 10 ++++++++++ include/linux/pci.h | 2 ++ 2 files changed, 12 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3..f95c8b2 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 53f4904..a6e1b1b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -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 {
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 | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..ce9f42b 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,12 @@ 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)) { + pci_dev_put(rdev); + return true; + } + adev = ACPI_COMPANION(&root->dev); if (!adev) return false;
On Wed, Apr 14, 2021 at 04:18:01PM +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 | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..ce9f42b 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,12 @@ 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)) {
pci_dev_put(rdev);return true;- }
- adev = ACPI_COMPANION(&root->dev); if (!adev) return false;
-- 2.7.4
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.
You are receiving this message because of the following common error(s) as indicated below:
- This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for what needs to be done here to properly describe this.
If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.
thanks,
greg k-h's patch email bot
On Wed, Apr 14, 2021 at 04:18:01PM +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]
Chaitanya's Sign-off should be under the annotation explaining what he changed, and placed below the original author's sign-off.
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+
It doesn't appear that you're reading Greg's autobot reply. This spot right here is where you should describe what is different about this patch compared to your previous versions.
drivers/nvme/host/pci.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..ce9f42b 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,12 @@ 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));
Instead of assuming '0', shouldn't you use the domain of the NVMe PCI device?
[AMD Public Use]
From: Keith Busch kbusch@kernel.org Sent: Thursday, April 15, 2021 12:24 AM To: Liang, Prike Prike.Liang@amd.com Cc: linux-nvme@lists.infradead.org; Chaitanya.Kulkarni@wdc.com; gregkh@linuxfoundation.org; hch@infradead.org; stable@vger.kernel.org; S- k, Shyam-sundar Shyam-sundar.S-k@amd.com; Deucher, Alexander Alexander.Deucher@amd.com Subject: Re: [PATCH 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume
On Wed, Apr 14, 2021 at 04:18:01PM +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]
Chaitanya's Sign-off should be under the annotation explaining what he changed, and placed below the original author's sign-off.
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+
It doesn't appear that you're reading Greg's autobot reply. This spot right here is where you should describe what is different about this patch compared to your previous versions.
Thanks proposal and will update the author info and patch version.
drivers/nvme/host/pci.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..ce9f42b 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,12 @@ 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));
Instead of assuming '0', shouldn't you use the domain of the NVMe PCI device?
Now we just add the NVMe shutdown quirk by checking the root complex ID instead of adding more and more variables endpoint NVMe device.
On Thu, Apr 15, 2021 at 03:22:52AM +0000, Liang, Prike wrote:
+rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
Instead of assuming '0', shouldn't you use the domain of the NVMe PCI device?
Now we just add the NVMe shutdown quirk by checking the root complex ID instead of adding more and more variables endpoint NVMe device.
I understand what you are doing. I am just suggesting this quirk use the RC of the device in question rather than assume the RC is in domain 0. I realize a platform will probably align to your assumption. This is just for correctness and should look like:
rdev = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus), 0, PCI_DEVFN(0, 0));
[AMD Public Use]
From: Keith Busch kbusch@kernel.org Sent: Thursday, April 15, 2021 11:59 AM To: Liang, Prike Prike.Liang@amd.com Cc: linux-nvme@lists.infradead.org; Chaitanya.Kulkarni@wdc.com; gregkh@linuxfoundation.org; hch@infradead.org; stable@vger.kernel.org; S- k, Shyam-sundar Shyam-sundar.S-k@amd.com; Deucher, Alexander Alexander.Deucher@amd.com Subject: Re: [PATCH 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume
On Thu, Apr 15, 2021 at 03:22:52AM +0000, Liang, Prike wrote:
+rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
Instead of assuming '0', shouldn't you use the domain of the NVMe PCI device?
Now we just add the NVMe shutdown quirk by checking the root complex
ID instead of adding more and more variables endpoint NVMe device.
I understand what you are doing. I am just suggesting this quirk use the RC of the device in question rather than assume the RC is in domain 0. I realize a platform will probably align to your assumption. This is just for correctness and should look like:
rdev = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus), 0, PCI_DEVFN(0, 0));
Thanks, I confirm the device domain also enumerated as 0 by calculating the NVMe controller sys index and will update the patch.
On Wed, Apr 14, 2021 at 04:18: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.
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
Reviewed-by: Chaitanya Kulkarni chaitanya.kulkarni@wdc.com Cc: stable@vger.kernel.org # 5.11+
drivers/pci/quirks.c | 10 ++++++++++ include/linux/pci.h | 2 ++ 2 files changed, 12 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3..f95c8b2 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 53f4904..a6e1b1b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -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 { -- 2.7.4
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.
You are receiving this message because of the following common error(s) as indicated below:
- This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/SubmittingPatches for what needs to be done here to properly describe this.
If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.
thanks,
greg k-h's patch email bot
linux-stable-mirror@lists.linaro.org
-
Greg KH -
Keith Busch -
Liang, Prike -
Prike Liang