Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1480693

[tip:x86/apic] x86/ioapic: Ignore root bridges without a companion ACPI device

Show all headers | View raw

Commit-ID:  d9c149d6ce1a94de578a4e323f6881fcb6b986ab
Gitweb:     http://git.kernel.org/tip/d9c149d6ce1a94de578a4e323f6881fcb6b986ab
Author:     Rui Wang <rui.y.wang@intel.com>
AuthorDate: Sat, 10 Sep 2016 23:40:45 +0800
Committer:  Ingo Molnar <mingo@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 <bp@suse.de>
Signed-off-by: Rui Wang <rui.y.wang@intel.com>
Reviewed-by: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bhelgaas@google.com
Cc: helgaas@kernel.org
Cc: linux-acpi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: rjw@rjwysocki.net
Cc: tony.luck@intel.com
Link: http://lkml.kernel.org/r/1473522046-31329-1-git-send-email-rui.y.wang@intel.com
Signed-off-by: Ingo Molnar <mingo@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));
 	}
 }
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] x86/ioapic: Ignore root bridges without a companion ACPI device Rui Wang <rui.y.wang@intel.com> - 2016-09-10 18:00 +0200
  Re: [PATCH] x86/ioapic: Ignore root bridges without a companion ACPI  device Borislav Petkov <bp@alien8.de> - 2016-09-10 19:40 +0200
  [tip:x86/apic] x86/ioapic: Ignore root bridges without a companion  ACPI device tip-bot for Rui Wang <tipbot@zytor.com> - 2016-09-10 20:50 +0200
  Re: [PATCH] x86/ioapic: Ignore root bridges without a companion ACPI  device Jon Derrick <jonathan.derrick@intel.com> - 2016-09-12 23:30 +0200
    Re: [PATCH] x86/ioapic: Ignore root bridges without a companion ACPI  device Jon Derrick <jonathan.derrick@intel.com> - 2016-09-12 23:50 +0200
    RE: [PATCH] x86/ioapic: Ignore root bridges without a companion  ACPI device "Luck, Tony" <tony.luck@intel.com> - 2016-09-12 23:50 +0200

csiph-web