Commit d9644712 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v5.8-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fix from Bjorn Helgaas:
 "Disable ASPM on ASM1083/1085 PCIe-to-PCI bridge (Robert Hancock)"

* tag 'pci-v5.8-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge
parents e2c46b57 b361663c

drivers/pci/quirks.c

+13 −0
Original line number Diff line number Diff line
@@ -2330,6 +2330,19 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f1, quirk_disable_aspm_l0s); 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x10f4, quirk_disable_aspm_l0s);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1508, quirk_disable_aspm_l0s);



static void quirk_disable_aspm_l0s_l1(struct pci_dev *dev)

{

	pci_info(dev, "Disabling ASPM L0s/L1\n");

	pci_disable_link_state(dev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);

}



/*

 * ASM1083/1085 PCIe-PCI bridge devices cause AER timeout errors on the

 * upstream PCIe root port when ASPM is enabled. At least L0s mode is affected;

 * disable both L0s and L1 for now to be safe.

 */

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x1080, quirk_disable_aspm_l0s_l1);



/*

 * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain

 * Link bit cleared after starting the link retrain process to allow this

CRA Git | Maintained and supported by SUSTech CRA and CCSE