From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 4 Jun 2020 17:59:12 +0000 (-0500)
Subject: Merge branch 'pci/pm'
X-Git-Tag: v5.8-rc1~115^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae7322a06d225fadfc43a3eda950fc2b65d2d7a1;p=linux.git

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
---

ae7322a06d225fadfc43a3eda950fc2b65d2d7a1