[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-d9c149d6ce1a94de578a4e323f6881fcb6b986ab@git.kernel.org>
Date: Sat, 10 Sep 2016 11:34:22 -0700
From: tip-bot for Rui Wang <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, rui.y.wang@...el.com,
torvalds@...ux-foundation.org, bp@...en8.de, mingo@...nel.org,
tglx@...utronix.de, bp@...e.de, peterz@...radead.org
Subject: [tip:x86/apic] x86/ioapic: Ignore root bridges without a companion
ACPI device
Commit-ID: d9c149d6ce1a94de578a4e323f6881fcb6b986ab
Gitweb: http://git.kernel.org/tip/d9c149d6ce1a94de578a4e323f6881fcb6b986ab
Author: Rui Wang <rui.y.wang@...el.com>
AuthorDate: Sat, 10 Sep 2016 23:40:45 +0800
Committer: Ingo Molnar <mingo@...nel.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 <bp@...e.de>
Signed-off-by: Rui Wang <rui.y.wang@...el.com>
Reviewed-by: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: bhelgaas@...gle.com
Cc: helgaas@...nel.org
Cc: linux-acpi@...r.kernel.org
Cc: linux-pci@...r.kernel.org
Cc: rjw@...ysocki.net
Cc: tony.luck@...el.com
Link: http://lkml.kernel.org/r/1473522046-31329-1-git-send-email-rui.y.wang@intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.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));
}
}
Powered by blists - more mailing lists