@@ -2838,7 +2838,6 @@ 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;
@@ -2852,10 +2851,6 @@ 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;
@@ -327,17 +327,6 @@ 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)
{
@@ -227,8 +227,6 @@ 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),
/* Enable ASPM regardless of how LnkCtl is programmed */
PCI_DEV_FLAGS_ENABLE_ASPM = (__force pci_dev_flags_t) (1 << 15),
};
@@ -601,8 +601,6 @@
#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
BugLink: https://bugs.launchpad.net/bugs/1932577 This reverts commit 2d37b035a0f469d40ab0322b0f9dd7f2d43bc9b8. Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- 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 deletions(-)