Skip to content

Commit 060249b

Browse files
committed
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
2 parents fa9d4bf + 5260bd6 commit 060249b

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

drivers/pci/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ config PCI_HYPERV
196196

197197
config PCI_DYNAMIC_OF_NODES
198198
bool "Create Device tree nodes for PCI devices"
199-
depends on OF
199+
depends on OF_IRQ
200200
select OF_DYNAMIC
201201
help
202202
This option enables support for generating device tree nodes for some

drivers/pci/probe.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
997997
res = window->res;
998998
if (!res->flags && !res->start && !res->end) {
999999
release_resource(res);
1000+
resource_list_destroy_entry(window);
10001001
continue;
10011002
}
10021003

drivers/pci/quirks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3726,7 +3726,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
37263726
*/
37273727
static void quirk_nvidia_no_bus_reset(struct pci_dev *dev)
37283728
{
3729-
if ((dev->device & 0xffc0) == 0x2340 || dev->device == 0x1eb8)
3729+
if ((dev->device & 0xffc0) == 0x2340)
37303730
quirk_no_bus_reset(dev);
37313731
}
37323732
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,

0 commit comments

Comments
 (0)