Commit 584c5c42 authored by Rui Wang's avatar Rui Wang Committed by Ingo Molnar
Browse files

x86/ioapic: Support hot-removal of IOAPICs present during boot 



IOAPICs present during system boot aren't added to ioapic_list,
thus are unable to be hot-removed. Fix it by calling
acpi_ioapic_add() during root bus enumeration.

Signed-off-by: default avatarRui Wang <rui.y.wang@intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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/1471420837-31003-3-git-send-email-rui.y.wang@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fe7bd58f

drivers/acpi/pci_root.c

+10 −0
Original line number Diff line number Diff line
@@ -614,6 +614,16 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	if (hotadd) {

		pcibios_resource_survey_bus(root->bus);

		pci_assign_unassigned_root_bus_resources(root->bus);

		/*

		 * This is only called for the hotadd case. For the boot-time

		 * case, we need to wait until after PCI initialization in

		 * order to deal with IOAPICs mapped in on a PCI BAR.

		 *

		 * This is currently x86-specific, because acpi_ioapic_add()

		 * is an empty function without CONFIG_ACPI_HOTPLUG_IOAPIC.

		 * And CONFIG_ACPI_HOTPLUG_IOAPIC depends on CONFIG_X86_IO_APIC

		 * (see drivers/acpi/Kconfig).

		 */

		acpi_ioapic_add(root->device->handle);

	}

drivers/pci/setup-bus.c

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/ioport.h>

#include <linux/cache.h>

#include <linux/slab.h>

#include <linux/acpi.h>

#include "pci.h"



unsigned int pci_flags;
@@ -1852,8 +1853,10 @@ void __init pci_assign_unassigned_resources(void) 
{

	struct pci_bus *root_bus;



	list_for_each_entry(root_bus, &pci_root_buses, node)

	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));

	}

}



void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)

CRA Git | Maintained and supported by SUSTech CRA and CCSE