@@ -701,8 +701,7 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)
aspm_l1ss_init(link);
/* Save default state */
- link->aspm_default = parent->dev_flags & PCI_DEV_FLAGS_ENABLE_ASPM ?
- ASPM_STATE_ALL : link->aspm_enabled;
+ link->aspm_default = link->aspm_enabled;
/* Setup initial capable state. Will be updated later */
link->aspm_capable = link->aspm_support;
@@ -6050,15 +6050,3 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size);
#endif
-
-/*
- * 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 void pci_fixup_enable_aspm(struct pci_dev *pdev)
-{
- pdev->dev_flags |= PCI_DEV_FLAGS_ENABLE_ASPM;
-}
-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);
@@ -244,8 +244,6 @@ enum pci_dev_flags {
PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
/* Device does honor MSI masking despite saying otherwise */
PCI_DEV_FLAGS_HAS_MSI_MASKING = (__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 << 13),
};
enum pci_irq_reroute_variant {
BugLink: https://bugs.launchpad.net/bugs/2034504 This reverts commit 1a0102a08f206149d9abd56c2b28877c878b5526. Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/pci/pcie/aspm.c | 3 +-- drivers/pci/quirks.c | 12 ------------ include/linux/pci.h | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-)