From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 29 Jan 2020 22:59:59 +0000 (-0600)
Subject: Merge branch 'pci/resource'
X-Git-Tag: v5.6-rc1~92^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cee538f6a24eefdbdb7820d3e97b120d496bb345;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/resource'

  - Clear only bridge windows (not BARs) while assigning bus resources
    (Logan Gunthorpe)

  - Improve resource assignment for deep hotplug hierarchies, e.g.,
    Thunderbolt (Nicholas Johnson)

* pci/resource:
  PCI: Allow adjust_bridge_window() to shrink resource if necessary
  PCI: Set resource size directly in adjust_bridge_window()
  PCI: Rename extend_bridge_window() to adjust_bridge_window()
  PCI: Rename extend_bridge_window() parameter
  PCI: Consider alignment of hot-added bridges when assigning resources
  PCI: Remove local variable usage in pci_bus_distribute_available_resources()
  PCI: Pass size + alignment to pci_bus_distribute_available_resources()
  PCI: Rename variables
  PCI: Remove unnecessary braces
  PCI: Don't disable bridge BARs when assigning bus resources
---

cee538f6a24eefdbdb7820d3e97b120d496bb345