x86/irq, ACPI: Implement ACPI driver to support IOAPIC hotplug
authorJiang Liu <jiang.liu@linux.intel.com>
Thu, 5 Feb 2015 05:44:49 +0000 (13:44 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Feb 2015 14:09:26 +0000 (15:09 +0100)
Enable support of IOAPIC hotplug by:
1) reintroducing ACPI based IOAPIC driver
2) enhance pci_root driver to hook hotplug events

The ACPI IOAPIC driver is always enabled if all of ACPI, PCI and IOAPIC
are enabled.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Len Brown <lenb@kernel.org>
Link: http://lkml.kernel.org/r/1414387308-27148-19-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/acpi/internal.h
drivers/acpi/ioapic.c [new file with mode: 0644]
drivers/acpi/pci_root.c

index 8951cefb0a965834be5a814a2a23e15ce7177c72..e6c3ddd926658cd615241328e1f51b90ce16c611 100644 (file)
@@ -315,6 +315,12 @@ config ACPI_HOTPLUG_MEMORY
          To compile this driver as a module, choose M here:
          the module will be called acpi_memhotplug.
 
+config ACPI_HOTPLUG_IOAPIC
+       bool
+       depends on PCI
+       depends on X86_IO_APIC
+       default y
+
 config ACPI_SBS
        tristate "Smart Battery System"
        depends on X86
index f74317cc1ca9343adfa20744e5d1d84cc4947a84..e59494c9040289b420a6ab5437645193023f8117 100644 (file)
@@ -70,6 +70,7 @@ obj-$(CONFIG_ACPI_PROCESSOR)  += processor.o
 obj-y                          += container.o
 obj-$(CONFIG_ACPI_THERMAL)     += thermal.o
 obj-y                          += acpi_memhotplug.o
+obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o
 obj-$(CONFIG_ACPI_BATTERY)     += battery.o
 obj-$(CONFIG_ACPI_SBS)         += sbshc.o
 obj-$(CONFIG_ACPI_SBS)         += sbs.o
index 163e82f536fa92337e9da8236e641eee5d90cc5b..caca2805536d5c15367b61e7399ba39a94a41a4a 100644 (file)
@@ -35,6 +35,13 @@ void acpi_int340x_thermal_init(void);
 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
 void register_dock_dependent_device(struct acpi_device *adev,
                                    acpi_handle dshandle);
diff --git a/drivers/acpi/ioapic.c b/drivers/acpi/ioapic.c
new file mode 100644 (file)
index 0000000..ccdc8db
--- /dev/null
@@ -0,0 +1,229 @@
+/*
+ * IOAPIC/IOxAPIC/IOSAPIC driver
+ *
+ * Copyright (C) 2009 Fujitsu Limited.
+ * (c) Copyright 2009 Hewlett-Packard Development Company, L.P.
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Based on original drivers/pci/ioapic.c
+ *     Yinghai Lu <yinghai@kernel.org>
+ *     Jiang Liu <jiang.liu@intel.com>
+ */
+
+/*
+ * This driver manages I/O APICs added by hotplug after boot.
+ * We try to claim all I/O APIC devices, but those present at boot were
+ * registered when we parsed the ACPI MADT.
+ */
+
+#define pr_fmt(fmt) "ACPI : IOAPIC: " fmt
+
+#include <linux/slab.h>
+#include <linux/acpi.h>
+#include <linux/pci.h>
+#include <acpi/acpi.h>
+
+struct acpi_pci_ioapic {
+       acpi_handle     root_handle;
+       acpi_handle     handle;
+       u32             gsi_base;
+       struct resource res;
+       struct pci_dev  *pdev;
+       struct list_head list;
+};
+
+static LIST_HEAD(ioapic_list);
+static DEFINE_MUTEX(ioapic_list_lock);
+
+static acpi_status setup_res(struct acpi_resource *acpi_res, void *data)
+{
+       struct resource *res = data;
+       struct resource_win win;
+
+       res->flags = 0;
+       if (acpi_dev_filter_resource_type(acpi_res, IORESOURCE_MEM) == 0)
+               return AE_OK;
+
+       if (!acpi_dev_resource_memory(acpi_res, res)) {
+               if (acpi_dev_resource_address_space(acpi_res, &win) ||
+                   acpi_dev_resource_ext_address_space(acpi_res, &win))
+                       *res = win.res;
+       }
+       if ((res->flags & IORESOURCE_PREFETCH) ||
+           (res->flags & IORESOURCE_DISABLED))
+               res->flags = 0;
+
+       return AE_CTRL_TERMINATE;
+}
+
+static bool acpi_is_ioapic(acpi_handle handle, char **type)
+{
+       acpi_status status;
+       struct acpi_device_info *info;
+       char *hid = NULL;
+       bool match = false;
+
+       if (!acpi_has_method(handle, "_GSB"))
+               return false;
+
+       status = acpi_get_object_info(handle, &info);
+       if (ACPI_SUCCESS(status)) {
+               if (info->valid & ACPI_VALID_HID)
+                       hid = info->hardware_id.string;
+               if (hid) {
+                       if (strcmp(hid, "ACPI0009") == 0) {
+                               *type = "IOxAPIC";
+                               match = true;
+                       } else if (strcmp(hid, "ACPI000A") == 0) {
+                               *type = "IOAPIC";
+                               match = true;
+                       }
+               }
+               kfree(info);
+       }
+
+       return match;
+}
+
+static acpi_status handle_ioapic_add(acpi_handle handle, u32 lvl,
+                                    void *context, void **rv)
+{
+       acpi_status status;
+       unsigned long long gsi_base;
+       struct acpi_pci_ioapic *ioapic;
+       struct pci_dev *dev = NULL;
+       struct resource *res = NULL;
+       char *type = NULL;
+
+       if (!acpi_is_ioapic(handle, &type))
+               return AE_OK;
+
+       mutex_lock(&ioapic_list_lock);
+       list_for_each_entry(ioapic, &ioapic_list, list)
+               if (ioapic->handle == handle) {
+                       mutex_unlock(&ioapic_list_lock);
+                       return AE_OK;
+               }
+
+       status = acpi_evaluate_integer(handle, "_GSB", NULL, &gsi_base);
+       if (ACPI_FAILURE(status)) {
+               acpi_handle_warn(handle, "failed to evaluate _GSB method\n");
+               goto exit;
+       }
+
+       ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
+       if (!ioapic) {
+               pr_err("cannot allocate memory for new IOAPIC\n");
+               goto exit;
+       } else {
+               ioapic->root_handle = (acpi_handle)context;
+               ioapic->handle = handle;
+               ioapic->gsi_base = (u32)gsi_base;
+               INIT_LIST_HEAD(&ioapic->list);
+       }
+
+       if (acpi_ioapic_registered(handle, (u32)gsi_base))
+               goto done;
+
+       dev = acpi_get_pci_dev(handle);
+       if (dev && pci_resource_len(dev, 0)) {
+               if (pci_enable_device(dev) < 0)
+                       goto exit_put;
+               pci_set_master(dev);
+               if (pci_request_region(dev, 0, type))
+                       goto exit_disable;
+               res = &dev->resource[0];
+               ioapic->pdev = dev;
+       } else {
+               pci_dev_put(dev);
+               dev = NULL;
+
+               res = &ioapic->res;
+               acpi_walk_resources(handle, METHOD_NAME__CRS, setup_res, res);
+               if (res->flags == 0) {
+                       acpi_handle_warn(handle, "failed to get resource\n");
+                       goto exit_free;
+               } else if (request_resource(&iomem_resource, res)) {
+                       acpi_handle_warn(handle, "failed to insert resource\n");
+                       goto exit_free;
+               }
+       }
+
+       if (acpi_register_ioapic(handle, res->start, (u32)gsi_base)) {
+               acpi_handle_warn(handle, "failed to register IOAPIC\n");
+               goto exit_release;
+       }
+done:
+       list_add(&ioapic->list, &ioapic_list);
+       mutex_unlock(&ioapic_list_lock);
+
+       if (dev)
+               dev_info(&dev->dev, "%s at %pR, GSI %u\n",
+                        type, res, (u32)gsi_base);
+       else
+               acpi_handle_info(handle, "%s at %pR, GSI %u\n",
+                                type, res, (u32)gsi_base);
+
+       return AE_OK;
+
+exit_release:
+       if (dev)
+               pci_release_region(dev, 0);
+       else
+               release_resource(res);
+exit_disable:
+       if (dev)
+               pci_disable_device(dev);
+exit_put:
+       pci_dev_put(dev);
+exit_free:
+       kfree(ioapic);
+exit:
+       mutex_unlock(&ioapic_list_lock);
+       *(acpi_status *)rv = AE_ERROR;
+       return AE_OK;
+}
+
+int acpi_ioapic_add(struct acpi_pci_root *root)
+{
+       acpi_status status, retval = AE_OK;
+
+       status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root->device->handle,
+                                    UINT_MAX, handle_ioapic_add, NULL,
+                                    root->device->handle, (void **)&retval);
+
+       return ACPI_SUCCESS(status) && ACPI_SUCCESS(retval) ? 0 : -ENODEV;
+}
+
+int acpi_ioapic_remove(struct acpi_pci_root *root)
+{
+       int retval = 0;
+       struct acpi_pci_ioapic *ioapic, *tmp;
+
+       mutex_lock(&ioapic_list_lock);
+       list_for_each_entry_safe(ioapic, tmp, &ioapic_list, list) {
+               if (root->device->handle != ioapic->root_handle)
+                       continue;
+
+               if (acpi_unregister_ioapic(ioapic->handle, ioapic->gsi_base))
+                       retval = -EBUSY;
+
+               if (ioapic->pdev) {
+                       pci_release_region(ioapic->pdev, 0);
+                       pci_disable_device(ioapic->pdev);
+                       pci_dev_put(ioapic->pdev);
+               } else if (ioapic->res.flags && ioapic->res.parent) {
+                       release_resource(&ioapic->res);
+               }
+               list_del(&ioapic->list);
+               kfree(ioapic);
+       }
+       mutex_unlock(&ioapic_list_lock);
+
+       return retval;
+}
index e53e0f6592045516b8af9165f238986772e3bc96..68a5f712cd198e5cd61b866d2068b9d52a1274f4 100644 (file)
@@ -621,6 +621,7 @@ 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);
        }
 
        pci_lock_rescan_remove();
@@ -644,6 +645,8 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 
        pci_stop_root_bus(root->bus);
 
+       WARN_ON(acpi_ioapic_remove(root));
+
        device_set_run_wake(root->bus->bridge, false);
        pci_acpi_remove_bus_pm_notifier(device);