From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 20 Apr 2023 21:16:33 +0000 (-0500)
Subject: Merge branch 'pci/reset'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=43ca31e00254fe2ee0712afdad2a6681e2eb34ae;p=linux.git

Merge branch 'pci/reset'

- Wait longer for devices to become ready after resume (as we do for reset)
  to accommodate Intel Titan Ridge xHCI devices (Mika Westerberg)

- Drop pci_bridge_wait_for_secondary_bus() timeout parameter since all
  callers pass the same value (Mika Westerberg)

- Extend D3hot delay for NVIDIA HDA controllers to avoid unrecoverable
  devices after a bus reset (Alex Williamson)

* pci/reset:
  PCI/PM: Extend D3hot delay for NVIDIA HDA controllers
  PCI/PM: Drop pci_bridge_wait_for_secondary_bus() timeout parameter
  PCI/PM: Increase wait time after resume
---

43ca31e00254fe2ee0712afdad2a6681e2eb34ae