| Message ID | 1466912697-3498-1-git-send-email-rui.y.wang@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Sun, Jun 26, 2016 at 11:44:57AM +0800, Rui Wang wrote: > v5: Remove #ifdef CONFIG_X86 from setup-bus.c, making it neutral to archs. > v4: Add comments explaining when to call acpi_ioapic_add(). > v3: Previous versions break mips. This version fixes it. > > 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: Rui Wang <rui.y.wang@intel.com> Hi Rui, Where are we at with this? If there's anything that still needs to be merged, can you rebase it to v4.8-rc1 and post a new, complete, series? Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday, Aug 9, 2016 4:23 AM, Bjorn Helgaas wrote: > On Sun, Jun 26, 2016 at 11:44:57AM +0800, Rui Wang wrote: > > v5: Remove #ifdef CONFIG_X86 from setup-bus.c, making it neutral to > archs. > > v4: Add comments explaining when to call acpi_ioapic_add(). > > v3: Previous versions break mips. This version fixes it. > > > > 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: Rui Wang <rui.y.wang@intel.com> > > Hi Rui, > > Where are we at with this? If there's anything that still needs to be merged, > can you rebase it to v4.8-rc1 and post a new, complete, series? > Hi Bjorn, Yes. These patches are needed for IOAPIC hotplug to work. So Thomas & Rafael, any advice? Thanks Rui -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Aug 9, 2016 at 5:23 AM, Rui Wang <rui.y.wang@intel.com> wrote: > On Tuesday, Aug 9, 2016 4:23 AM, Bjorn Helgaas wrote: >> On Sun, Jun 26, 2016 at 11:44:57AM +0800, Rui Wang wrote: >> > v5: Remove #ifdef CONFIG_X86 from setup-bus.c, making it neutral to >> archs. >> > v4: Add comments explaining when to call acpi_ioapic_add(). >> > v3: Previous versions break mips. This version fixes it. >> > >> > 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: Rui Wang <rui.y.wang@intel.com> >> >> Hi Rui, >> >> Where are we at with this? If there's anything that still needs to be merged, >> can you rebase it to v4.8-rc1 and post a new, complete, series? >> > Hi Bjorn, > > Yes. These patches are needed for IOAPIC hotplug to work. > > So Thomas & Rafael, any advice? Can you please do as per what Bjorn said? That is, rebase the series on top of 4.8-rc1 and post it afresh? Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 27cc7fe..6d8e67e 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -40,10 +40,8 @@ int acpi_sysfs_init(void); void acpi_container_init(void); void acpi_memory_hotplug_init(void); #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC -int acpi_ioapic_add(struct acpi_pci_root *root); int acpi_ioapic_remove(struct acpi_pci_root *root); #else -static inline int acpi_ioapic_add(struct acpi_pci_root *root) { return 0; } static inline int acpi_ioapic_remove(struct acpi_pci_root *root) { return 0; } #endif #ifdef CONFIG_ACPI_DOCK diff --git a/drivers/acpi/ioapic.c b/drivers/acpi/ioapic.c index ccdc8db..0f272e2 100644 --- a/drivers/acpi/ioapic.c +++ b/drivers/acpi/ioapic.c @@ -189,16 +189,17 @@ exit: return AE_OK; } -int acpi_ioapic_add(struct acpi_pci_root *root) +int acpi_ioapic_add(acpi_handle root_handle) { acpi_status status, retval = AE_OK; - status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root->device->handle, + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root_handle, UINT_MAX, handle_ioapic_add, NULL, - root->device->handle, (void **)&retval); + root_handle, (void **)&retval); return ACPI_SUCCESS(status) && ACPI_SUCCESS(retval) ? 0 : -ENODEV; } +EXPORT_SYMBOL_GPL(acpi_ioapic_add); int acpi_ioapic_remove(struct acpi_pci_root *root) { diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e..31e4440 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -614,7 +614,18 @@ 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); - acpi_ioapic_add(root); + + /* + * 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); } pci_lock_rescan_remove(); diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 55641a3..e32c356 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -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; @@ -1779,8 +1780,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) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 288fac5..f5114dc 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -680,6 +680,12 @@ static inline enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev) #endif /* !CONFIG_ACPI */ +#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC +int acpi_ioapic_add(acpi_handle root); +#else +static inline int acpi_ioapic_add(acpi_handle root) { return 0; } +#endif + #ifdef CONFIG_ACPI void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 pm1a_ctrl, u32 pm1b_ctrl));
v5: Remove #ifdef CONFIG_X86 from setup-bus.c, making it neutral to archs. v4: Add comments explaining when to call acpi_ioapic_add(). v3: Previous versions break mips. This version fixes it. 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: Rui Wang <rui.y.wang@intel.com> --- drivers/acpi/internal.h | 2 -- drivers/acpi/ioapic.c | 7 ++++--- drivers/acpi/pci_root.c | 13 ++++++++++++- drivers/pci/setup-bus.c | 5 ++++- include/linux/acpi.h | 6 ++++++ 5 files changed, 26 insertions(+), 7 deletions(-)