Skip to content

Commit d9c149d

Browse files
ruiwang1Ingo Molnar
authored andcommitted
x86/ioapic: Ignore root bridges without a companion ACPI device
Some PCI root bridges don't have a corresponding ACPI device. This can be the case on some old platforms. Don't call acpi_ioapic_add() on these bridges because they can't support ioapic hotplug. Reported-and-tested-by: Borislav Petkov <[email protected]> Signed-off-by: Rui Wang <[email protected]> Reviewed-by: Borislav Petkov <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 5035da4 commit d9c149d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/pci/setup-bus.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1855,7 +1855,10 @@ void __init pci_assign_unassigned_resources(void)
18551855

18561856
list_for_each_entry(root_bus, &pci_root_buses, node) {
18571857
pci_assign_unassigned_root_bus_resources(root_bus);
1858-
acpi_ioapic_add(ACPI_HANDLE(root_bus->bridge));
1858+
1859+
/* Make sure the root bridge has a companion ACPI device: */
1860+
if (ACPI_HANDLE(root_bus->bridge))
1861+
acpi_ioapic_add(ACPI_HANDLE(root_bus->bridge));
18591862
}
18601863
}
18611864

0 commit comments

Comments
 (0)