Commit-ID: d9c149d6ce1a94de578a4e323f6881fcb6b986ab Gitweb: http://git.kernel.org/tip/d9c149d6ce1a94de578a4e323f6881fcb6b986ab Author: Rui Wang <rui.y.w...@intel.com> AuthorDate: Sat, 10 Sep 2016 23:40:45 +0800 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Sat, 10 Sep 2016 20:30:31 +0200
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 <b...@suse.de> Signed-off-by: Rui Wang <rui.y.w...@intel.com> Reviewed-by: Borislav Petkov <b...@alien8.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: bhelg...@google.com Cc: helg...@kernel.org Cc: linux-a...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: r...@rjwysocki.net Cc: tony.l...@intel.com Link: http://lkml.kernel.org/r/1473522046-31329-1-git-send-email-rui.y.w...@intel.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- drivers/pci/setup-bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index ec538d3..f30ca75 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1855,7 +1855,10 @@ void __init pci_assign_unassigned_resources(void) list_for_each_entry(root_bus, &pci_root_buses, node) { pci_assign_unassigned_root_bus_resources(root_bus); - acpi_ioapic_add(ACPI_HANDLE(root_bus->bridge)); + + /* Make sure the root bridge has a companion ACPI device: */ + if (ACPI_HANDLE(root_bus->bridge)) + acpi_ioapic_add(ACPI_HANDLE(root_bus->bridge)); } }
