Commit 060249b5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pci-v6.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

Pull PCI fixes from Bjorn Helgaas:

 - Add PCI_DYNAMIC_OF_NODES dependency on OF_IRQ to fix sparc64 build
   error (Lizhi Hou)

 - After coalescing host bridge resources, free any released resources
   to avoid a leak (Ross Lagerwall)

 - Revert a quirk that prevented NVIDIA T4 GPUs from using Secondary Bus
   Reset. The quirk worked around an issue that we now think is related
   to the Root Port, not the GPU (Bjorn Helgaas)

* tag 'pci-v6.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
  PCI: Free released resource after coalescing
  PCI: Fix CONFIG_PCI_DYNAMIC_OF_NODES kconfig dependencies
parents fa9d4bf5 5260bd6d
...@@ -196,7 +196,7 @@ config PCI_HYPERV ...@@ -196,7 +196,7 @@ config PCI_HYPERV
config PCI_DYNAMIC_OF_NODES config PCI_DYNAMIC_OF_NODES
bool "Create Device tree nodes for PCI devices" bool "Create Device tree nodes for PCI devices"
depends on OF depends on OF_IRQ
select OF_DYNAMIC select OF_DYNAMIC
help help
This option enables support for generating device tree nodes for some This option enables support for generating device tree nodes for some
......
...@@ -997,6 +997,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) ...@@ -997,6 +997,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
res = window->res; res = window->res;
if (!res->flags && !res->start && !res->end) { if (!res->flags && !res->start && !res->end) {
release_resource(res); release_resource(res);
resource_list_destroy_entry(window);
continue; continue;
} }
......
...@@ -3726,7 +3726,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev) ...@@ -3726,7 +3726,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
*/ */
static void quirk_nvidia_no_bus_reset(struct pci_dev *dev) static void quirk_nvidia_no_bus_reset(struct pci_dev *dev)
{ {
if ((dev->device & 0xffc0) == 0x2340 || dev->device == 0x1eb8) if ((dev->device & 0xffc0) == 0x2340)
quirk_no_bus_reset(dev); quirk_no_bus_reset(dev);
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment