History

Merge branch 'pci/pm'

- Check .bridge_d3() hook for NULL before calling it (Bjorn Helgaas) - Disable PME# for Pericom OHCI/UHCI USB controllers because it's not reliably asserted on USB hotplug (Kai-Heng Feng) - Assume ports without DLL Link Active train links in 100 ms to work around Thunderbolt bridge defects (Mika Westerberg) * pci/pm: PCI/PM: Assume ports without DLL Link Active train links in 100 ms PCI/PM: Adjust pcie_wait_for_link_delay() for caller delay PCI: Avoid Pericom USB controller OHCI/EHCI PME# defect serial: 8250_pci: Move Pericom IDs to pci_ids.h PCI/PM: Call .bridge_d3() hook only if non-NULL

Bjorn Helgaas committed 6 years ago

Commit ae7322a2 parents ff33cc2 ec411e04 files · +45 −18Browse files

Showing the changes to include/linux (1 of 4 files). Show all

Unified · Split

include/linux/pci_ids.h+6−0
@@ -1832,6 +1832,12 @@ · 1831 unmodified lines
1832#define PCI_VENDOR_ID_NVIDIA_SGS 0x12d21832#define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2
1833#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x00181833#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
1834 1834
1835#define PCI_VENDOR_ID_PERICOM 0x12D8
1836#define PCI_DEVICE_ID_PERICOM_PI7C9X7951 0x7951
1837#define PCI_DEVICE_ID_PERICOM_PI7C9X7952 0x7952
1838#define PCI_DEVICE_ID_PERICOM_PI7C9X7954 0x7954
1839#define PCI_DEVICE_ID_PERICOM_PI7C9X7958 0x7958
1840
1835#define PCI_SUBVENDOR_ID_CHASE_PCIFAST 0x12E01841#define PCI_SUBVENDOR_ID_CHASE_PCIFAST 0x12E0
1836#define PCI_SUBDEVICE_ID_CHASE_PCIFAST4 0x00311842#define PCI_SUBDEVICE_ID_CHASE_PCIFAST4 0x0031
1837#define PCI_SUBDEVICE_ID_CHASE_PCIFAST8 0x00211843#define PCI_SUBDEVICE_ID_CHASE_PCIFAST8 0x0021