[L/M/Unstable] [PATCH 2/9] Revert "UBUNTU: SAUCE: PCI/ASPM: Enable LTR for endpoints behind VMD"

[Kai-Heng Feng]

BugLink: https://bugs.launchpad.net/bugs/2034504

This reverts commit 47c7bfd31514e7b54a1f830f7707297aebbb8679.

Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
 drivers/pci/quirks.c | 48 +++-----------------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 1198dc07754f..4ff1bb93a2bd 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -6052,55 +6052,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size);
 #endif
 
 /*
- * Device [8086:9a09], [8086:a0b0] and [8086:a0bc]
+ * Device [8086:9a09]
  * BIOS may not be able to access config space of devices under VMD domain, so
  * it relies on software to enable ASPM for links under VMD.
  */
-static const struct pci_device_id vmd_bridge_tbl[] = {
-	{ PCI_VDEVICE(INTEL, 0x9a09) },
-	{ PCI_VDEVICE(INTEL, 0xa0b0) },
-	{ PCI_VDEVICE(INTEL, 0xa0bc) },
-	{ }
-};
-
 static void pci_fixup_enable_aspm(struct pci_dev *pdev)
 {
-	if (!pci_match_id(vmd_bridge_tbl, pdev))
-		return;
-
 	pdev->dev_flags |= PCI_DEV_FLAGS_ENABLE_ASPM;
 }
-DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
-			       PCI_CLASS_BRIDGE_PCI, 8, pci_fixup_enable_aspm);
-
-static void pci_fixup_enable_vmd_nvme_ltr(struct pci_dev *pdev)
-{
-	struct pci_dev *parent;
-	int pos;
-	u16 val;
-
-	parent = pci_upstream_bridge(pdev);
-	if (!parent)
-		return;
-
-	if (!pci_match_id(vmd_bridge_tbl, parent))
-		return;
-
-	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_LTR);
-	if (!pos)
-		return;
-
-	pci_read_config_word(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, &val);
-	if (val)
-		return;
-
-	pci_read_config_word(pdev, pos + PCI_LTR_MAX_NOSNOOP_LAT, &val);
-	if (val)
-		return;
-
-	/* 3145728ns, i.e. 0x300000ns */
-	pci_write_config_word(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, 0x1003);
-	pci_write_config_word(pdev, pos + PCI_LTR_MAX_NOSNOOP_LAT, 0x1003);
-}
-DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
-			      PCI_CLASS_STORAGE_EXPRESS, 0, pci_fixup_enable_vmd_nvme_ltr);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a09, pci_fixup_enable_aspm);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa0b0, pci_fixup_enable_aspm);
-- 
2.34.1