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

Groups > linux.kernel > #1480655

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

Show all headers | View raw

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.

v2: Per Boris's review, removed the unnecessary local var; refined comment

Signed-off-by: Rui Wang <rui.y.wang@intel.com>
Reviewed-by: Borislav Petkov <bp@alien8.de>
---
 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..8b4e231 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));
 	}
 }
 
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — 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