x86, irq: Support ioapic controller hotplug

1. check overlaping gsi range
for hot-add ioapic case, BIOS may have some entries in MADT and also have setting in pci root bus with _GSB of DSDT.

2. check if entries is in right range.

Signed-off-by Yinghai Lu <[email protected]>

Cc Joerg Roedel <[email protected]>

Cc Konrad Rzeszutek Wilk <[email protected]>

Cc Sebastian Andrzej Siewior <[email protected]>

---
 arch/x86/kernel/apic/io_apic.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

arch/x86/kernel/apic/io_apic.c +17 -6

index b026cc7..60c6706 100644
@@ -3818,12 +3818,9 @@ void __init ioapic_insert_resources(void)
        }
 }
 
-int mp_find_ioapic(u32 gsi)
+static int __mp_find_ioapic(u32 gsi)
 {
-       int i = 0;
-
-       if (nr_ioapics == 0)
-               return -1;
+       int i;
 
        /* Find the IOAPIC that manages this GSI. */
        for_each_ioapic(i) {

@@ -3833,10 +3830,19 @@ int mp_find_ioapic(u32 gsi)
                        return i;
        }
 
-       printk(KERN_ERR "ERROR: Unable to locate IOAPIC for GSI %d\n", gsi);
        return -1;
 }
 
+int mp_find_ioapic(u32 gsi)
+{
+       int ret = __mp_find_ioapic(gsi);
+
+       if (ret == -1)
+               pr_err("ERROR: Unable to locate IOAPIC for GSI %d\n", gsi);
+
+       return ret;
+}
+
 int mp_find_ioapic_pin(int ioapic, u32 gsi)
 {
        struct mp_ioapic_gsi *gsi_cfg;

@@ -3888,6 +3894,11 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
        if (bad_ioapic(address))
                return;
 
+       /* already registered ? */
+       idx = __mp_find_ioapic(gsi_base);
+       if (idx >= 0)
+               return;
+
        idx = find_first_zero_bit(ioapics_mask, MAX_IO_APICS);
        if (idx >= MAX_IO_APICS) {
                pr_warn("WARNING: Max # of I/O APICs (%d) exceeded, skipping\n",

arch/x86/kernel/apic/io_apic.c +7 -1

+
+       if (!entries || entries > MP_MAX_IOAPIC_PIN) {
+               clear_fixmap(FIX_IO_APIC_BASE_0 + idx);
+               memset(&ioapics[idx], 0, sizeof(struct ioapic));
+               return;
+       }
+
        gsi_cfg = mp_ioapic_gsi_routing(idx);
        gsi_cfg->gsi_base = gsi_base;
        gsi_cfg->gsi_end = gsi_base + entries - 1;
--

1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

arch/x86/kernel/apic/io_apic.c +8 -0

+
 	idx = find_first_zero_bit(ioapics_mask, MAX_IO_APICS);
 	if (idx >= MAX_IO_APICS) {
 		pr_warn("WARNING: Max # of I/O APICs (%d) exceeded, skipping\n",

@@ -3914,6 +3925,13 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
 	 * and to prevent reprogramming of IOAPIC pins (PCI GSIs).
 	 */
 	entries = io_apic_get_redir_entries(idx);
+
+	if (!entries || entries > MP_MAX_IOAPIC_PIN) {
+		clear_fixmap(FIX_IO_APIC_BASE_0 + idx);
+		memset(&ioapics[idx], 0, sizeof(struct ioapic));
+		return;
+	}
+
 	gsi_cfg = mp_ioapic_gsi_routing(idx);
 	gsi_cfg->gsi_base = gsi_base;
 	gsi_cfg->gsi_end = gsi_base + entries - 1;

ioapic hotplug should be built-in like pci root bus hotplug.

Also need to make it depends on X86_IO_APIC.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/pci/Kconfig  | 3 ++-
 drivers/pci/ioapic.c | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

drivers/pci/Kconfig +2 -1

index 81944fb..6c9ede2 100644
@@ -109,9 +109,10 @@ config PCI_PASID
 	  If unsure, say N.
 
 config PCI_IOAPIC
-	tristate "PCI IO-APIC hotplug support" if X86
+	bool "PCI IO-APIC hotplug support" if X86
 	depends on PCI
 	depends on ACPI
+	depends on X86_IO_APIC
 	default !X86
 
 config PCI_LABEL

drivers/pci/ioapic.c +5 -1

index 1b90579..7d6b157 100644
@@ -113,6 +113,10 @@ static struct pci_driver ioapic_driver = {
 	.remove		= ioapic_remove,
 };
 
-module_pci_driver(ioapic_driver);
+static int __init ioapic_init(void)
+{
+	return pci_register_driver(&ioapic_driver);
+}
+module_init(ioapic_init);
 
 MODULE_LICENSE("GPL");

Signature · 1 line

1.8.1.4

Quoted 4 lines · Yinghai Lu

ioapic hotplug should be built-in like pci root bus hotplug.

Also need to make it depends on X86_IO_APIC.

Quoted 1 line

Signed-off-by Yinghai Lu <[email protected]>

Hi Yinghai,

What's the status of these? It looks like the last three or four could go via my PCI tree, but I don't know whether they depend on the earlier patches. If they could be applied separately, I could merge them and we could make *some* progress.

Also, it looks like you planned some rework related to _UID and resource parsing, so I've been waiting for that to show up before doing much more.

During ioapic hotplug, acpi_register_ioapic will be called. Now for x86, that function is blank.
Fill that will update __mp_register_ioapic to use those ioapic.

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/kernel/acpi/boot.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +0 -0

index 5be15d1..4a5336d 100644

arch/x86/kernel/acpi/boot.c +3 -3

+
+	return	__mp_register_ioapic(id, phys_addr, gsi_base, true);
 }
 
 EXPORT_SYMBOL(acpi_register_ioapic);
 
 int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
 {
-	/* TBD */
-	return -EINVAL;
+	return mp_unregister_ioapic(gsi_base);
 }
 
 EXPORT_SYMBOL(acpi_unregister_ioapic);
--

1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Quoted 15 lines · Yinghai Lu

During ioapic hotplug, acpi_register_ioapic will be called. Now for x86, that function is blank.
Fill that will update __mp_register_ioapic to use those ioapic.

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/kernel/acpi/boot.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +0 -0

index 5be15d1..4a5336d 100644
@@ -707,16 +707,18 @@ EXPORT_SYMBOL(acpi_unmap_lsapic);
 

arch/x86/kernel/acpi/boot.c EXPORT_SYMBOL(acpi_unmap_lsapic); · line 712

Quoted 7 lines

arch/x86/kernel/acpi/boot.c +3 -2

 int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
 {
-     /* TBD */
-     return -EINVAL;
+     unsigned long long id = 0;
+
+     acpi_evaluate_integer(handle, "_UID", NULL, &id);

We cannot assume that "_UID" is an integer. "_UID" can be either an integer or a string. Need to consider the case when it is a string.

Quoted 16 lines · rui wang

Quoted 15 lines · Yinghai Lu

During ioapic hotplug, acpi_register_ioapic will be called. Now for x86, that function is blank.
Fill that will update __mp_register_ioapic to use those ioapic.

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/kernel/acpi/boot.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +0 -0

index 5be15d1..4a5336d 100644
@@ -707,16 +707,18 @@ EXPORT_SYMBOL(acpi_unmap_lsapic);
 

Quoted 11 lines

arch/x86/kernel/acpi/boot.c EXPORT_SYMBOL(acpi_unmap_lsapic); · line 712

Quoted 8 lines

arch/x86/kernel/acpi/boot.c +3 -2

 int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32
 gsi_base)
 {
-     /* TBD */
-     return -EINVAL;
+     unsigned long long id = 0;
+
+     acpi_evaluate_integer(handle, "_UID", NULL, &id);

We cannot assume that "_UID" is an integer. "_UID" can be either an integer or a string. Need to consider the case when it is a string.

Yes.

But do you have test case for ioapic that _UID is not integer?

Thanks

Yinghai

Quoted 29 lines · Yinghai Lu

Quoted 16 lines · rui wang

Quoted 15 lines · Yinghai Lu

During ioapic hotplug, acpi_register_ioapic will be called. Now for x86, that function is blank.
Fill that will update __mp_register_ioapic to use those ioapic.

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/kernel/acpi/boot.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +0 -0

index 5be15d1..4a5336d 100644
@@ -707,16 +707,18 @@ EXPORT_SYMBOL(acpi_unmap_lsapic);
 

Quoted 11 lines

arch/x86/kernel/acpi/boot.c EXPORT_SYMBOL(acpi_unmap_lsapic); · line 712

Quoted 8 lines

arch/x86/kernel/acpi/boot.c +3 -2

 int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32
 gsi_base)
 {
-     /* TBD */
-     return -EINVAL;
+     unsigned long long id = 0;
+
+     acpi_evaluate_integer(handle, "_UID", NULL, &id);

We cannot assume that "_UID" is an integer. "_UID" can be either an integer or a string. Need to consider the case when it is a string.

Quoted 4 lines

Yes.

But do you have test case for ioapic that _UID is not integer?

Yes I have an IOAPIC with an _UID of:

        Name (_UID, "IOAPIC01")  // _UID: Unique ID

It's a bit challenge how you'll conjure unique identifiers from both integers and strings. If you have a new patch I can help try it out.

Quoted 37 lines · rui wang

Quoted 29 lines · Yinghai Lu

Quoted 16 lines · rui wang

Quoted 15 lines · Yinghai Lu

During ioapic hotplug, acpi_register_ioapic will be called. Now for x86, that function is blank.
Fill that will update __mp_register_ioapic to use those ioapic.

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/kernel/acpi/boot.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

arch/x86/kernel/acpi/boot.c +0 -0

index 5be15d1..4a5336d 100644
@@ -707,16 +707,18 @@ EXPORT_SYMBOL(acpi_unmap_lsapic);
 

Quoted 11 lines

arch/x86/kernel/acpi/boot.c EXPORT_SYMBOL(acpi_unmap_lsapic); · line 712

Quoted 8 lines

arch/x86/kernel/acpi/boot.c +3 -2

 int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32
 gsi_base)
 {
-     /* TBD */
-     return -EINVAL;
+     unsigned long long id = 0;
+
+     acpi_evaluate_integer(handle, "_UID", NULL, &id);

We cannot assume that "_UID" is an integer. "_UID" can be either an integer or a string. Need to consider the case when it is a string.

Quoted 4 lines

Yes.

But do you have test case for ioapic that _UID is not integer?

Yes I have an IOAPIC with an _UID of:

Quoted 4 lines

        Name (_UID, "IOAPIC01")  // _UID: Unique ID

It's a bit challenge how you'll conjure unique identifiers from both integers and strings. If you have a new patch I can help try it out.

Then do you have _MAT with that ioapic device or else?

need to find the _MAT entry with GSM matching to find out ioapic id.

Thanks

Yinghai

Quoted 3 lines · Yinghai Lu

Quoted 2 lines

It's a bit challenge how you'll conjure unique identifiers from both integers and strings. If you have a new patch I can help try it out.

Quoted 4 lines

Then do you have _MAT with that ioapic device or else?

need to find the _MAT entry with GSM matching to find out ioapic id.

There's no _MAT for the IOAPICs. I only find _MAT for the LAPICs. But there's a static MADT in APIC.dsl which contains IOAPIC entries with ioapic ids.

We need to have ioapic setup before normal pci drivers. otherwise other pci driver can not setup irq.

So we should not treat them as normal pci devices.
Also we will need to support ioapic hotplug without pci device around.

We need to call ioapic add/remove during host-bridge add/remove.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/acpi/pci_root.c  |   4 ++
 drivers/pci/ioapic.c     | 147
++++++++++++++++++++++++++++++-----------------
 include/linux/pci-acpi.h |   8 +++
 3 files changed, 106 insertions(+), 53 deletions(-)

drivers/acpi/pci_root.c +4 -0

index 5917839..7577175 100644
@@ -532,6 +532,8 @@ static int acpi_pci_root_add(struct acpi_device
 *device,
 		pci_enable_bridges(root->bus);
 	}
 
+	acpi_pci_ioapic_add(root);
+
 	pci_bus_add_devices(root->bus);
 	return 1;

@@ -546,6 +548,8 @@ static void acpi_pci_root_remove(struct acpi_device
 *device)
 
 	pci_stop_root_bus(root->bus);
 
+	acpi_pci_ioapic_remove(root);
+
 	device_set_run_wake(root->bus->bridge, false);
 	pci_acpi_remove_bus_pm_notifier(device);

drivers/pci/ioapic.c +27 -26

index 7d6b157..60351b2 100644
@@ -22,101 +22,142 @@
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 
-struct ioapic {
-	acpi_handle	handle;
+struct acpi_pci_ioapic {
+	acpi_handle	root_handle;
 	u32		gsi_base;
+	struct pci_dev *pdev;
+	struct list_head list;
 };
 
-static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id
 *ent)
+static LIST_HEAD(ioapic_list);
+static DEFINE_MUTEX(ioapic_list_lock);
+
+static void handle_ioapic_add(acpi_handle handle, struct pci_dev **pdev,
+				 u32 *pgsi_base)
 {
-	acpi_handle handle;
 	acpi_status status;
 	unsigned long long gsb;
-	struct ioapic *ioapic;
+	struct pci_dev *dev;
+	u32 gsi_base;
 	int ret;
 	char *type;
-	struct resource *res;
+	struct resource r;
+	struct resource *res = &r;
+	char objname[64];
+	struct acpi_buffer buffer = {sizeof(objname), objname};
 
-	handle = DEVICE_ACPI_HANDLE(&dev->dev);
-	if (!handle)
-		return -EINVAL;
+	*pdev = NULL;
+	*pgsi_base = 0;
 
 	status = acpi_evaluate_integer(handle, "_GSB", NULL, &gsb);
-	if (ACPI_FAILURE(status))
-		return -EINVAL;
-
-	/*
-	 * The previous code in acpiphp evaluated _MAT if _GSB failed, but
-	 * ACPI spec 4.0 sec 6.2.2 requires _GSB for hot-pluggable I/O APICs.
-	 */
+	if (ACPI_FAILURE(status) || !gsb)
+		return;
 
-	ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
-	if (!ioapic)
-		return -ENOMEM;
+	dev = acpi_get_pci_dev(handle);
+	if (!dev)
+		return;
 
-	ioapic->handle = handle;
-	ioapic->gsi_base = (u32) gsb;
+	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
-	if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
-		type = "IOAPIC";
-	else
-		type = "IOxAPIC";
+	gsi_base = gsb;
+	type = "IOxAPIC";
 
 	ret = pci_enable_device(dev);
 	if (ret < 0)
-		goto exit_free;
+		goto exit_put;
 
 	pci_set_master(dev);
 
+	if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)

From 2fff3297b4c71c88d92b04ba9ad0a8931b3e99b8 Mon Sep 17 00:00:00 2001

drivers/pci/ioapic.c +63 -26

-	pci_set_drvdata(dev, ioapic);
-	dev_info(&dev->dev, "%s at %pR, GSI %u\n", type, res, ioapic->gsi_base);
-	return 0;
+	pr_info("%s %s %s at %pR, GSI %u\n",
+		dev_name(&dev->dev), objname, type,
+		res, gsi_base);
+
+	*pdev = dev;
+	*pgsi_base = gsi_base;
+	return;
 
 exit_release:
 	pci_release_region(dev, 0);
 exit_disable:
 	pci_disable_device(dev);
-exit_free:
-	kfree(ioapic);
-	return -ENODEV;
+exit_put:
+	pci_dev_put(dev);
 }
 
-static void ioapic_remove(struct pci_dev *dev)
+static void handle_ioapic_remove(acpi_handle handle, struct pci_dev *dev,
+				  u32 gsi_base)
 {
-	struct ioapic *ioapic = pci_get_drvdata(dev);
+	acpi_unregister_ioapic(handle, gsi_base);
 
-	acpi_unregister_ioapic(ioapic->handle, ioapic->gsi_base);
 	pci_release_region(dev, 0);
 	pci_disable_device(dev);
-	kfree(ioapic);
+	pci_dev_put(dev);
 }
 
+static acpi_status register_ioapic(acpi_handle handle, u32 lvl,
+					void *context, void **rv)
+{
+	acpi_handle root_handle = context;
+	struct pci_dev *pdev;
+	u32 gsi_base;
+	struct acpi_pci_ioapic *ioapic;
 
-static DEFINE_PCI_DEVICE_TABLE(ioapic_devices) = {
-	{ PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOAPIC, ~0) },
-	{ PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOXAPIC, ~0) },
-	{ }
-};
-MODULE_DEVICE_TABLE(pci, ioapic_devices);
+	handle_ioapic_add(handle, &pdev, &gsi_base);
+	if (!gsi_base)
+		return AE_OK;
 
-static struct pci_driver ioapic_driver = {
-	.name		= "ioapic",
-	.id_table	= ioapic_devices,
-	.probe		= ioapic_probe,
-	.remove		= ioapic_remove,
-};
+	ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
+	if (!ioapic) {
+		pr_err("%s: cannot allocate memory\n", __func__);
+		handle_ioapic_remove(root_handle, pdev, gsi_base);
+		return AE_OK;
+	}
+	ioapic->root_handle = root_handle;
+	ioapic->pdev = pdev;
+	ioapic->gsi_base = gsi_base;
+
+	mutex_lock(&ioapic_list_lock);
+	list_add(&ioapic->list, &ioapic_list);
+	mutex_unlock(&ioapic_list_lock);
+
+	return AE_OK;
+}
 
-static int __init ioapic_init(void)
+void acpi_pci_ioapic_add(struct acpi_pci_root *root)
 {
-	return pci_register_driver(&ioapic_driver);
+	acpi_status status;
+
+	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root->device->handle,
+				     (u32)1, register_ioapic, NULL,
+				     root->device->handle,
+				     NULL);
+	if (ACPI_FAILURE(status))
+		pr_err("%s: register_ioapic failure - %d", __func__, status);
 }
-module_init(ioapic_init);
 
-MODULE_LICENSE("GPL");
+void acpi_pci_ioapic_remove(struct acpi_pci_root *root)
+{
+	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;
+		list_del(&ioapic->list);
+		handle_ioapic_remove(ioapic->root_handle, ioapic->pdev,
+					ioapic->gsi_base);
+		kfree(ioapic);
+	}
+	mutex_unlock(&ioapic_list_lock);
+}

include/linux/pci-acpi.h +8 -0

index 1704479..b2a2ced 100644
@@ -69,6 +69,14 @@ static inline void acpiphp_remove_slots(struct pci_bus
 *bus) { }
 static inline void acpiphp_check_host_bridge(acpi_handle handle) { }
 #endif
 
+#ifdef CONFIG_PCI_IOAPIC
+void acpi_pci_ioapic_add(struct acpi_pci_root *root);
+void acpi_pci_ioapic_remove(struct acpi_pci_root *root);
+#else
+static inline void acpi_pci_ioapic_add(struct acpi_pci_root *root) { }
+static inline void acpi_pci_ioapic_remove(struct acpi_pci_root *root) { }
+#endif
+
 #else	/* CONFIG_ACPI */
 static inline void acpi_pci_add_bus(struct pci_bus *bus) { }

static inline void acpi_pci_remove_bus(struct pci_bus *bus) { }
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Quoted 122 lines · Yinghai Lu

We need to have ioapic setup before normal pci drivers. otherwise other pci driver can not setup irq.

So we should not treat them as normal pci devices.
Also we will need to support ioapic hotplug without pci device around.

We need to call ioapic add/remove during host-bridge add/remove.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/acpi/pci_root.c  |   4 ++
 drivers/pci/ioapic.c     | 147
++++++++++++++++++++++++++++++-----------------
 include/linux/pci-acpi.h |   8 +++
 3 files changed, 106 insertions(+), 53 deletions(-)

drivers/acpi/pci_root.c +4 -0

index 5917839..7577175 100644
@@ -532,6 +532,8 @@ static int acpi_pci_root_add(struct acpi_device
 *device,
              pci_enable_bridges(root->bus);
      }
 
+     acpi_pci_ioapic_add(root);
+
      pci_bus_add_devices(root->bus);
      return 1;

@@ -546,6 +548,8 @@ static void acpi_pci_root_remove(struct acpi_device
 *device)
 
      pci_stop_root_bus(root->bus);
 
+     acpi_pci_ioapic_remove(root);
+
      device_set_run_wake(root->bus->bridge, false);
      pci_acpi_remove_bus_pm_notifier(device);

drivers/pci/ioapic.c +27 -26

index 7d6b157..60351b2 100644
@@ -22,101 +22,142 @@
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 
-struct ioapic {
-     acpi_handle     handle;
+struct acpi_pci_ioapic {
+     acpi_handle     root_handle;
      u32             gsi_base;
+     struct pci_dev *pdev;
+     struct list_head list;
 };
 
-static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id
 *ent)
+static LIST_HEAD(ioapic_list);
+static DEFINE_MUTEX(ioapic_list_lock);
+
+static void handle_ioapic_add(acpi_handle handle, struct pci_dev **pdev,
+                              u32 *pgsi_base)
 {
-     acpi_handle handle;
      acpi_status status;
      unsigned long long gsb;
-     struct ioapic *ioapic;
+     struct pci_dev *dev;
+     u32 gsi_base;
      int ret;
      char *type;
-     struct resource *res;
+     struct resource r;
+     struct resource *res = &r;
+     char objname[64];
+     struct acpi_buffer buffer = {sizeof(objname), objname};
 
-     handle = DEVICE_ACPI_HANDLE(&dev->dev);
-     if (!handle)
-             return -EINVAL;
+     *pdev = NULL;
+     *pgsi_base = 0;
 
      status = acpi_evaluate_integer(handle, "_GSB", NULL, &gsb);
-     if (ACPI_FAILURE(status))
-             return -EINVAL;
-
-     /*
-      * The previous code in acpiphp evaluated _MAT if _GSB failed, but
-      * ACPI spec 4.0 sec 6.2.2 requires _GSB for hot-pluggable I/O APICs.
-      */
+     if (ACPI_FAILURE(status) || !gsb)
+             return;
 
-     ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
-     if (!ioapic)
-             return -ENOMEM;
+     dev = acpi_get_pci_dev(handle);
+     if (!dev)
+             return;
 
-     ioapic->handle = handle;
-     ioapic->gsi_base = (u32) gsb;
+     acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
-     if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
-             type = "IOAPIC";
-     else
-             type = "IOxAPIC";
+     gsi_base = gsb;
+     type = "IOxAPIC";
 
      ret = pci_enable_device(dev);
      if (ret < 0)
-             goto exit_free;
+             goto exit_put;
 
      pci_set_master(dev);
 
+     if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)

drivers/pci/ioapic.c line 81

Quoted 10 lines

drivers/pci/ioapic.c +4 -1

+             type = "IOAPIC";
+
      if (pci_request_region(dev, 0, type))
              goto exit_disable;
 
      res = &dev->resource[0];
-     if (acpi_register_ioapic(ioapic->handle, res->start, ioapic->gsi_base))
+
+     if (acpi_register_ioapic(handle, res->start, gsi_base))
              goto exit_release;

Here acpi_register_ioapic() fails for IOAPICs already described by the static MADT. So they won't be added to the ioapic_list. Subsequent hot-removal will also fail because they're not found by acpi_pci_ioapic_remove() on the ioapic_list.

Here's what I used to fix it:

From 2fff3297b4c71c88d92b04ba9ad0a8931b3e99b8 Mon Sep 17 00:00:00 2001
From: Rui Wang <[email protected]>
Date: Tue, 27 Aug 2013 11:23:43 -0400
Subject: [PATCH] Hotadd of IOAPICs described in static MADT

For IOAPICs described in static MADT, we already called __mp_register_ioapic() in arch_early_irq_init(). During boot PCI root hotadd will call it again and will find it already registered, thus register_ioapic() won't add it to the ioapic_list. Subsequent hot-removal will also fail because it is not found on the
ioapic_list.

Signed-off-by Rui Wang <[email protected]>

---
 arch/x86/kernel/apic/io_apic.c |    4 +++-
 drivers/pci/ioapic.c           |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

arch/x86/kernel/apic/io_apic.c +3 -1

index fb9bf06..15ab9f1 100644
@@ -3956,8 +3956,10 @@ int __mp_register_ioapic(int id, u32 address,
 u32 gsi_base, bool hotadd)
 
        /* already registered ? */
        idx = __mp_find_ioapic(gsi_base);
-       if (idx >= 0)
+       if (idx >= 0) {
+               ret = -EEXIST;
                goto out;
+       }
 
        idx = find_first_zero_bit(ioapics_mask, MAX_IO_APICS);

        if (idx >= MAX_IO_APICS) {

drivers/pci/ioapic.c +2 -1

index 41f7c69..83b002b 100644
@@ -126,7 +126,8 @@ static void handle_ioapic_add(acpi_handle handle,
 struct pci_dev **pdev,
                }
        }
 
-       if (acpi_register_ioapic(handle, res->start, gsi_base)) {
+       ret = acpi_register_ioapic(handle, res->start, gsi_base);
+       if (ret && ret != -EEXIST) {
                if (dev)
                        goto exit_release;

                return;

--

Quoted 192 lines · rui wang

Quoted 132 lines · Yinghai Lu

We need to have ioapic setup before normal pci drivers. otherwise other pci driver can not setup irq.

So we should not treat them as normal pci devices.
Also we will need to support ioapic hotplug without pci device around.

We need to call ioapic add/remove during host-bridge add/remove.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/acpi/pci_root.c  |   4 ++
 drivers/pci/ioapic.c     | 147
++++++++++++++++++++++++++++++-----------------
 include/linux/pci-acpi.h |   8 +++
 3 files changed, 106 insertions(+), 53 deletions(-)

drivers/acpi/pci_root.c +4 -0

index 5917839..7577175 100644
@@ -532,6 +532,8 @@ static int acpi_pci_root_add(struct acpi_device
 *device,
              pci_enable_bridges(root->bus);
      }
 
+     acpi_pci_ioapic_add(root);
+
      pci_bus_add_devices(root->bus);
      return 1;

@@ -546,6 +548,8 @@ static void acpi_pci_root_remove(struct acpi_device
 *device)
 
      pci_stop_root_bus(root->bus);
 
+     acpi_pci_ioapic_remove(root);
+
      device_set_run_wake(root->bus->bridge, false);
      pci_acpi_remove_bus_pm_notifier(device);

drivers/pci/ioapic.c +17 -15

index 7d6b157..60351b2 100644
@@ -22,101 +22,142 @@
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 
-struct ioapic {
-     acpi_handle     handle;
+struct acpi_pci_ioapic {
+     acpi_handle     root_handle;
      u32             gsi_base;
+     struct pci_dev *pdev;
+     struct list_head list;
 };
 
-static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id
 *ent)
+static LIST_HEAD(ioapic_list);
+static DEFINE_MUTEX(ioapic_list_lock);
+
+static void handle_ioapic_add(acpi_handle handle, struct pci_dev
 **pdev,
+                              u32 *pgsi_base)
 {
-     acpi_handle handle;
      acpi_status status;
      unsigned long long gsb;
-     struct ioapic *ioapic;
+     struct pci_dev *dev;
+     u32 gsi_base;
      int ret;
      char *type;
-     struct resource *res;
+     struct resource r;
+     struct resource *res = &r;
+     char objname[64];
+     struct acpi_buffer buffer = {sizeof(objname), objname};
 
-     handle = DEVICE_ACPI_HANDLE(&dev->dev);
-     if (!handle)
-             return -EINVAL;
+     *pdev = NULL;
+     *pgsi_base = 0;
 
      status = acpi_evaluate_integer(handle, "_GSB", NULL, &gsb);
-     if (ACPI_FAILURE(status))
-             return -EINVAL;
-
-     /*
-      * The previous code in acpiphp evaluated _MAT if _GSB failed, but
-      * ACPI spec 4.0 sec 6.2.2 requires _GSB for hot-pluggable I/O

APICs.

drivers/pci/ioapic.c +12 -12

-      */
+     if (ACPI_FAILURE(status) || !gsb)
+             return;
 
-     ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
-     if (!ioapic)
-             return -ENOMEM;
+     dev = acpi_get_pci_dev(handle);
+     if (!dev)
+             return;
 
-     ioapic->handle = handle;
-     ioapic->gsi_base = (u32) gsb;
+     acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
-     if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
-             type = "IOAPIC";
-     else
-             type = "IOxAPIC";
+     gsi_base = gsb;
+     type = "IOxAPIC";
 
      ret = pci_enable_device(dev);
      if (ret < 0)
-             goto exit_free;
+             goto exit_put;
 
      pci_set_master(dev);
 
+     if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
+             type = "IOAPIC";
+
      if (pci_request_region(dev, 0, type))
              goto exit_disable;
 
      res = &dev->resource[0];
-     if (acpi_register_ioapic(ioapic->handle, res->start,

ioapic->gsi_base))

drivers/pci/ioapic.c

Quoted 3 lines

drivers/pci/ioapic.c +2 -0

+
+     if (acpi_register_ioapic(handle, res->start, gsi_base))
              goto exit_release;

Here acpi_register_ioapic() fails for IOAPICs already described by the static MADT. So they won't be added to the ioapic_list. Subsequent hot-removal will also fail because they're not found by acpi_pci_ioapic_remove() on the ioapic_list.

Here's what I used to fix it:

From 2fff3297b4c71c88d92b04ba9ad0a8931b3e99b8 Mon Sep 17 00:00:00 2001
From: Rui Wang <[email protected]>
Date: Tue, 27 Aug 2013 11:23:43 -0400
Subject: [PATCH] Hotadd of IOAPICs described in static MADT

For IOAPICs described in static MADT, we already called __mp_register_ioapic()
in arch_early_irq_init(). During boot PCI root hotadd will call it again and
will find it already registered, thus register_ioapic() won't add it to the
ioapic_list. Subsequent hot-removal will also fail because it is not found on the
ioapic_list.

Signed-off-by Rui Wang <[email protected]>

---
 arch/x86/kernel/apic/io_apic.c |    4 +++-
 drivers/pci/ioapic.c           |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

arch/x86/kernel/apic/io_apic.c +3 -1

index fb9bf06..15ab9f1 100644
@@ -3956,8 +3956,10 @@ int __mp_register_ioapic(int id, u32 address,
 u32 gsi_base, bool hotadd)
 
        /* already registered ? */
        idx = __mp_find_ioapic(gsi_base);
-       if (idx >= 0)
+       if (idx >= 0) {
+               ret = -EEXIST;
                goto out;
+       }
 
        idx = find_first_zero_bit(ioapics_mask, MAX_IO_APICS);

        if (idx >= MAX_IO_APICS) {

drivers/pci/ioapic.c +0 -0

index 41f7c69..83b002b 100644
@@ -126,7 +126,8 @@ static void handle_ioapic_add(acpi_handle handle,
 struct pci_dev **pdev,
                }
        }
 

Quoted 7 lines

drivers/pci/ioapic.c +2 -1

-       if (acpi_register_ioapic(handle, res->start, gsi_base)) {
+       ret = acpi_register_ioapic(handle, res->start, gsi_base);
+       if (ret && ret != -EEXIST) {
                if (dev)
                        goto exit_release;

                return;

--

ok, will put it my series.

Thanks

Yinghai

drivers/acpi/pci_root.c +4 -0

+	acpi_pci_ioapic_add(root);
+
 	pci_bus_add_devices(root->bus);
 	return 1;
 

@@ -546,6 +548,8 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 
 	pci_stop_root_bus(root->bus);
 
+	acpi_pci_ioapic_remove(root);
+
 	device_set_run_wake(root->bus->bridge, false);
 	pci_acpi_remove_bus_pm_notifier(device);
 

drivers/pci/ioapic.c +94 -53

index 7d6b157..60351b2 100644
@@ -22,101 +22,142 @@
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 
-struct ioapic {
-	acpi_handle	handle;
+struct acpi_pci_ioapic {
+	acpi_handle	root_handle;
 	u32		gsi_base;
+	struct pci_dev *pdev;
+	struct list_head list;
 };
 
-static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)
+static LIST_HEAD(ioapic_list);
+static DEFINE_MUTEX(ioapic_list_lock);
+
+static void handle_ioapic_add(acpi_handle handle, struct pci_dev **pdev,
+				 u32 *pgsi_base)
 {
-	acpi_handle handle;
 	acpi_status status;
 	unsigned long long gsb;
-	struct ioapic *ioapic;
+	struct pci_dev *dev;
+	u32 gsi_base;
 	int ret;
 	char *type;
-	struct resource *res;
+	struct resource r;
+	struct resource *res = &r;
+	char objname[64];
+	struct acpi_buffer buffer = {sizeof(objname), objname};
 
-	handle = DEVICE_ACPI_HANDLE(&dev->dev);
-	if (!handle)
-		return -EINVAL;
+	*pdev = NULL;
+	*pgsi_base = 0;
 
 	status = acpi_evaluate_integer(handle, "_GSB", NULL, &gsb);
-	if (ACPI_FAILURE(status))
-		return -EINVAL;
-
-	/*
-	 * The previous code in acpiphp evaluated _MAT if _GSB failed, but
-	 * ACPI spec 4.0 sec 6.2.2 requires _GSB for hot-pluggable I/O APICs.
-	 */
+	if (ACPI_FAILURE(status) || !gsb)
+		return;
 
-	ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
-	if (!ioapic)
-		return -ENOMEM;
+	dev = acpi_get_pci_dev(handle);
+	if (!dev)
+		return;
 
-	ioapic->handle = handle;
-	ioapic->gsi_base = (u32) gsb;
+	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
-	if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
-		type = "IOAPIC";
-	else
-		type = "IOxAPIC";
+	gsi_base = gsb;
+	type = "IOxAPIC";
 
 	ret = pci_enable_device(dev);
 	if (ret < 0)
-		goto exit_free;
+		goto exit_put;
 
 	pci_set_master(dev);
 
+	if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
+		type = "IOAPIC";
+
 	if (pci_request_region(dev, 0, type))
 		goto exit_disable;
 
 	res = &dev->resource[0];
-	if (acpi_register_ioapic(ioapic->handle, res->start, ioapic->gsi_base))
+
+	if (acpi_register_ioapic(handle, res->start, gsi_base))
 		goto exit_release;
 
-	pci_set_drvdata(dev, ioapic);
-	dev_info(&dev->dev, "%s at %pR, GSI %u\n", type, res, ioapic->gsi_base);
-	return 0;
+	pr_info("%s %s %s at %pR, GSI %u\n",
+		dev_name(&dev->dev), objname, type,
+		res, gsi_base);
+
+	*pdev = dev;
+	*pgsi_base = gsi_base;
+	return;
 
 exit_release:
 	pci_release_region(dev, 0);
 exit_disable:
 	pci_disable_device(dev);
-exit_free:
-	kfree(ioapic);
-	return -ENODEV;
+exit_put:
+	pci_dev_put(dev);
 }
 
-static void ioapic_remove(struct pci_dev *dev)
+static void handle_ioapic_remove(acpi_handle handle, struct pci_dev *dev,
+				  u32 gsi_base)
 {
-	struct ioapic *ioapic = pci_get_drvdata(dev);
+	acpi_unregister_ioapic(handle, gsi_base);
 
-	acpi_unregister_ioapic(ioapic->handle, ioapic->gsi_base);
 	pci_release_region(dev, 0);
 	pci_disable_device(dev);
-	kfree(ioapic);
+	pci_dev_put(dev);
 }
 
+static acpi_status register_ioapic(acpi_handle handle, u32 lvl,
+					void *context, void **rv)
+{
+	acpi_handle root_handle = context;
+	struct pci_dev *pdev;
+	u32 gsi_base;
+	struct acpi_pci_ioapic *ioapic;
 
-static DEFINE_PCI_DEVICE_TABLE(ioapic_devices) = {
-	{ PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOAPIC, ~0) },
-	{ PCI_DEVICE_CLASS(PCI_CLASS_SYSTEM_PIC_IOXAPIC, ~0) },
-	{ }
-};
-MODULE_DEVICE_TABLE(pci, ioapic_devices);
+	handle_ioapic_add(handle, &pdev, &gsi_base);
+	if (!gsi_base)
+		return AE_OK;
 
-static struct pci_driver ioapic_driver = {
-	.name		= "ioapic",
-	.id_table	= ioapic_devices,
-	.probe		= ioapic_probe,
-	.remove		= ioapic_remove,
-};
+	ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL);
+	if (!ioapic) {
+		pr_err("%s: cannot allocate memory\n", __func__);
+		handle_ioapic_remove(root_handle, pdev, gsi_base);
+		return AE_OK;
+	}
+	ioapic->root_handle = root_handle;
+	ioapic->pdev = pdev;
+	ioapic->gsi_base = gsi_base;
+
+	mutex_lock(&ioapic_list_lock);
+	list_add(&ioapic->list, &ioapic_list);
+	mutex_unlock(&ioapic_list_lock);
+
+	return AE_OK;
+}
 
-static int __init ioapic_init(void)
+void acpi_pci_ioapic_add(struct acpi_pci_root *root)
 {
-	return pci_register_driver(&ioapic_driver);
+	acpi_status status;
+
+	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root->device->handle,
+				     (u32)1, register_ioapic, NULL,
+				     root->device->handle,
+				     NULL);
+	if (ACPI_FAILURE(status))
+		pr_err("%s: register_ioapic failure - %d", __func__, status);
 }
-module_init(ioapic_init);
 
-MODULE_LICENSE("GPL");
+void acpi_pci_ioapic_remove(struct acpi_pci_root *root)
+{
+	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;
+		list_del(&ioapic->list);
+		handle_ioapic_remove(ioapic->root_handle, ioapic->pdev,
+					ioapic->gsi_base);
+		kfree(ioapic);
+	}
+	mutex_unlock(&ioapic_list_lock);
+}

include/linux/pci-acpi.h +8 -0

index 1704479..b2a2ced 100644
@@ -69,6 +69,14 @@ static inline void acpiphp_remove_slots(struct pci_bus *bus) { }
 static inline void acpiphp_check_host_bridge(acpi_handle handle) { }
 #endif
 
+#ifdef CONFIG_PCI_IOAPIC
+void acpi_pci_ioapic_add(struct acpi_pci_root *root);
+void acpi_pci_ioapic_remove(struct acpi_pci_root *root);
+#else
+static inline void acpi_pci_ioapic_add(struct acpi_pci_root *root) { }
+static inline void acpi_pci_ioapic_remove(struct acpi_pci_root *root) { }
+#endif
+
 #else	/* CONFIG_ACPI */
 static inline void acpi_pci_add_bus(struct pci_bus *bus) { }
 static inline void acpi_pci_remove_bus(struct pci_bus *bus) { }

Some ioapic controllers do not show up on pci config space, or pci device is there but no bar is used and is set by firmware in other non standard registers.

We can get ioapic address from ACPI0009's _CRS.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/pci/ioapic.c | 86
+++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 15 deletions(-)

drivers/pci/ioapic.c +0 -0

index 60351b2..41f7c69 100644
@@ -32,6 +32,36 @@ struct acpi_pci_ioapic {
 static LIST_HEAD(ioapic_list);
 static DEFINE_MUTEX(ioapic_list_lock);

drivers/pci/ioapic.c +59 -15

+	if (!ACPI_SUCCESS(status))
+		return AE_OK;
+
+	if (addr.resource_type == ACPI_MEMORY_RANGE) {
+		if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
+			return AE_OK;
+		flags = IORESOURCE_MEM;
+	} else
+		return AE_OK;
+
+	start = addr.minimum + addr.translation_offset;
+	end = addr.maximum + addr.translation_offset;
+
+	res = data;
+	res->flags = flags;
+	res->start = start;
+	res->end = end;
+
+	return AE_OK;
+}
+
 static void handle_ioapic_add(acpi_handle handle, struct pci_dev **pdev,
 				 u32 *pgsi_base)
 {

@@ -54,33 +84,56 @@ static void handle_ioapic_add(acpi_handle handle, struct
 pci_dev **pdev,
 		return;
 
 	dev = acpi_get_pci_dev(handle);
-	if (!dev)
-		return;
+	if (!dev || !pci_resource_len(dev, 0)) {
+		struct acpi_device_info *info;
+		char *hid = NULL;
+
+		status = acpi_get_object_info(handle, &info);
+		if (ACPI_FAILURE(status))
+			goto exit_put;
+		if (info->valid & ACPI_VALID_HID)
+			hid = info->hardware_id.string;
+		if (!hid || strcmp(hid, "ACPI0009")) {
+			kfree(info);
+			goto exit_put;
+		}
+		kfree(info);
+		memset(res, 0, sizeof(*res));
+		acpi_walk_resources(handle, METHOD_NAME__CRS, setup_res, res);
+		if (!res->flags)
+			goto exit_put;
+	}
 
 	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
 	gsi_base = gsb;
 	type = "IOxAPIC";
+	if (dev) {
+		ret = pci_enable_device(dev);
+		if (ret < 0)
+			goto exit_put;
 
-	ret = pci_enable_device(dev);
-	if (ret < 0)
-		goto exit_put;
-
-	pci_set_master(dev);
+		pci_set_master(dev);
 
-	if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
-		type = "IOAPIC";
+		if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
+			type = "IOAPIC";
 
-	if (pci_request_region(dev, 0, type))
-		goto exit_disable;
+		if (pci_resource_len(dev, 0)) {
+			if (pci_request_region(dev, 0, type))
+				goto exit_disable;
 
-	res = &dev->resource[0];
+			res = &dev->resource[0];
+		}
+	}
 
-	if (acpi_register_ioapic(handle, res->start, gsi_base))
-		goto exit_release;
+	if (acpi_register_ioapic(handle, res->start, gsi_base)) {
+		if (dev)
+			goto exit_release;
+		return;
+	}
 
 	pr_info("%s %s %s at %pR, GSI %u\n",
-		dev_name(&dev->dev), objname, type,
+		dev ? dev_name(&dev->dev) : "", objname, type,
 		res, gsi_base);
 

drivers/pci/ioapic.c +3 -0

 	*pdev = dev;

@@ -100,6 +153,9 @@ static void handle_ioapic_remove(acpi_handle handle,
 struct pci_dev *dev,
 {
 	acpi_unregister_ioapic(handle, gsi_base);
 
+	if (!dev)
+		return;
+
 	pci_release_region(dev, 0);
 	pci_disable_device(dev);

pci_dev_put(dev);
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Quoted 20 lines · Yinghai Lu

Some ioapic controllers do not show up on pci config space, or pci device is there but no bar is used and is set by firmware in other non standard registers.

We can get ioapic address from ACPI0009's _CRS.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/pci/ioapic.c | 86
+++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 15 deletions(-)

drivers/pci/ioapic.c +0 -0

index 60351b2..41f7c69 100644
@@ -32,6 +32,36 @@ struct acpi_pci_ioapic {
 static LIST_HEAD(ioapic_list);
 static DEFINE_MUTEX(ioapic_list_lock);
 

drivers/pci/ioapic.c struct acpi_pci_ioapic { · line 43

Quoted 9 lines

drivers/pci/ioapic.c +9 -0

+static acpi_status setup_res(struct acpi_resource *acpi_res, void *data)
+{
+	struct resource *res;
+	struct acpi_resource_address64 addr;
+	acpi_status status;
+	unsigned long flags;
+	u64 start, end;
+
+	status = acpi_resource_to_address64(acpi_res, &addr);

The above function fails on my machine because it does not handle Memory32Fixed resources. Is the following _CRS declaration allowed for IOAPIC?

            Device (APIC)
            {
                Name (_HID, "ACPI0009")  // _HID: Hardware ID
                Name (_CRS, ResourceTemplate ()  // _CRS: Current
Resource Settings
                {
                    Memory32Fixed (ReadOnly,
                        0xFEC01000,         // Address Base
                        0x00001000,         // Address Length
                        )
                })
                Method(_GSB) {
                        return (0x18)
                }
            }

Thanks
Rui

Quoted 119 lines

drivers/pci/ioapic.c +21 -0

+	if (!ACPI_SUCCESS(status))
+		return AE_OK;
+
+	if (addr.resource_type == ACPI_MEMORY_RANGE) {
+		if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
+			return AE_OK;
+		flags = IORESOURCE_MEM;
+	} else
+		return AE_OK;
+
+	start = addr.minimum + addr.translation_offset;
+	end = addr.maximum + addr.translation_offset;
+
+	res = data;
+	res->flags = flags;
+	res->start = start;
+	res->end = end;
+
+	return AE_OK;
+}
+
 static void handle_ioapic_add(acpi_handle handle, struct pci_dev **pdev,
 				 u32 *pgsi_base)
 {

@@ -54,33 +84,56 @@ static void handle_ioapic_add(acpi_handle handle,

struct
pci_dev **pdev,

drivers/pci/ioapic.c +41 -15

 		return;
 
 	dev = acpi_get_pci_dev(handle);
-	if (!dev)
-		return;
+	if (!dev || !pci_resource_len(dev, 0)) {
+		struct acpi_device_info *info;
+		char *hid = NULL;
+
+		status = acpi_get_object_info(handle, &info);
+		if (ACPI_FAILURE(status))
+			goto exit_put;
+		if (info->valid & ACPI_VALID_HID)
+			hid = info->hardware_id.string;
+		if (!hid || strcmp(hid, "ACPI0009")) {
+			kfree(info);
+			goto exit_put;
+		}
+		kfree(info);
+		memset(res, 0, sizeof(*res));
+		acpi_walk_resources(handle, METHOD_NAME__CRS, setup_res, res);
+		if (!res->flags)
+			goto exit_put;
+	}
 
 	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
 	gsi_base = gsb;
 	type = "IOxAPIC";
+	if (dev) {
+		ret = pci_enable_device(dev);
+		if (ret < 0)
+			goto exit_put;
 
-	ret = pci_enable_device(dev);
-	if (ret < 0)
-		goto exit_put;
-
-	pci_set_master(dev);
+		pci_set_master(dev);
 
-	if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
-		type = "IOAPIC";
+		if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC)
+			type = "IOAPIC";
 
-	if (pci_request_region(dev, 0, type))
-		goto exit_disable;
+		if (pci_resource_len(dev, 0)) {
+			if (pci_request_region(dev, 0, type))
+				goto exit_disable;
 
-	res = &dev->resource[0];
+			res = &dev->resource[0];
+		}
+	}
 
-	if (acpi_register_ioapic(handle, res->start, gsi_base))
-		goto exit_release;
+	if (acpi_register_ioapic(handle, res->start, gsi_base)) {
+		if (dev)
+			goto exit_release;
+		return;
+	}
 
 	pr_info("%s %s %s at %pR, GSI %u\n",
-		dev_name(&dev->dev), objname, type,
+		dev ? dev_name(&dev->dev) : "", objname, type,
 		res, gsi_base);
 
 	*pdev = dev;

@@ -100,6 +153,9 @@ static void handle_ioapic_remove(acpi_handle handle,
 struct pci_dev *dev,
 {
 	acpi_unregister_ioapic(handle, gsi_base);
 
+	if (!dev)
+		return;
+
 	pci_release_region(dev, 0);
 	pci_disable_device(dev);

pci_dev_put(dev);
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/