diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-10-26 13:20:47 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-11-04 16:06:39 -0500 |
commit | 204d49a5613a06eb2fa5c3b842a29b1336cc7995 (patch) | |
tree | 942a75a2a900858c7bd34af0669256e09faae577 /drivers/pci/ioapic.c | |
parent | 476f644edf7c22b47e6a118e4a1e138112a5ef14 (diff) |
PCI hotplug: move IOAPIC support from acpiphp to ioapic driver
This patch moves PCI I/O APIC support from acpiphp to a separate driver.
Like pciehp and shpchp, acpiphp handles PCI hotplug, i.e., addition and
removal of PCI adapters. But in addition, acpiphp handles some ACPI
hotplug, such as the addition of new host bridges, and the I/O APIC
support was tangled up with that.
I don't think the I/O APIC support needs to be in acpiphp; PCI I/O APICs
usually appear as a function on a PCI host bridge, and we'll enumerate the
APIC before any of the devices behind the bridge that use it.
As far as I know, nobody actually uses I/O APIC hotplug. It depends on
acpi_register_ioapic(), which is only implemented for ia64, and I don't
think any vendors have supported I/O chassis hotplug yet.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
CC: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
CC: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/ioapic.c')
-rw-r--r-- | drivers/pci/ioapic.c | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c new file mode 100644 index 000000000000..3e0d7b5dd1b9 --- /dev/null +++ b/drivers/pci/ioapic.c | |||
@@ -0,0 +1,127 @@ | |||
1 | /* | ||
2 | * IOAPIC/IOxAPIC/IOSAPIC driver | ||
3 | * | ||
4 | * Copyright (C) 2009 Fujitsu Limited. | ||
5 | * (c) Copyright 2009 Hewlett-Packard Development Company, L.P. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | /* | ||
13 | * This driver manages PCI I/O APICs added by hotplug after boot. We try to | ||
14 | * claim all I/O APIC PCI devices, but those present at boot were registered | ||
15 | * when we parsed the ACPI MADT, so we'll fail when we try to re-register | ||
16 | * them. | ||
17 | */ | ||
18 | |||
19 | #include <linux/pci.h> | ||
20 | #include <linux/acpi.h> | ||
21 | #include <acpi/acpi_bus.h> | ||
22 | |||
23 | struct ioapic { | ||
24 | acpi_handle handle; | ||
25 | u32 gsi_base; | ||
26 | }; | ||
27 | |||
28 | static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent) | ||
29 | { | ||
30 | acpi_handle handle; | ||
31 | acpi_status status; | ||
32 | unsigned long long gsb; | ||
33 | struct ioapic *ioapic; | ||
34 | u64 addr; | ||
35 | int ret; | ||
36 | char *type; | ||
37 | |||
38 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | ||
39 | if (!handle) | ||
40 | return -EINVAL; | ||
41 | |||
42 | status = acpi_evaluate_integer(handle, "_GSB", NULL, &gsb); | ||
43 | if (ACPI_FAILURE(status)) | ||
44 | return -EINVAL; | ||
45 | |||
46 | /* | ||
47 | * The previous code in acpiphp evaluated _MAT if _GSB failed, but | ||
48 | * ACPI spec 4.0 sec 6.2.2 requires _GSB for hot-pluggable I/O APICs. | ||
49 | */ | ||
50 | |||
51 | ioapic = kzalloc(sizeof(*ioapic), GFP_KERNEL); | ||
52 | if (!ioapic) | ||
53 | return -ENOMEM; | ||
54 | |||
55 | ioapic->handle = handle; | ||
56 | ioapic->gsi_base = (u32) gsb; | ||
57 | |||
58 | if (dev->class == PCI_CLASS_SYSTEM_PIC_IOAPIC) | ||
59 | type = "IOAPIC"; | ||
60 | else | ||
61 | type = "IOxAPIC"; | ||
62 | |||
63 | ret = pci_enable_device(dev); | ||
64 | if (ret < 0) | ||
65 | goto exit_free; | ||
66 | |||
67 | pci_set_master(dev); | ||
68 | |||
69 | if (pci_request_region(dev, 0, type)) | ||
70 | goto exit_disable; | ||
71 | |||
72 | addr = pci_resource_start(dev, 0); | ||
73 | if (acpi_register_ioapic(ioapic->handle, addr, ioapic->gsi_base)) | ||
74 | goto exit_release; | ||
75 | |||
76 | pci_set_drvdata(dev, ioapic); | ||
77 | dev_info(&dev->dev, "%s at %#llx, GSI %u\n", type, addr, | ||
78 | ioapic->gsi_base); | ||
79 | return 0; | ||
80 | |||
81 | exit_release: | ||
82 | pci_release_region(dev, 0); | ||
83 | exit_disable: | ||
84 | pci_disable_device(dev); | ||
85 | exit_free: | ||
86 | kfree(ioapic); | ||
87 | return -ENODEV; | ||
88 | } | ||
89 | |||
90 | static void ioapic_remove(struct pci_dev *dev) | ||
91 | { | ||
92 | struct ioapic *ioapic = pci_get_drvdata(dev); | ||
93 | |||
94 | acpi_unregister_ioapic(ioapic->handle, ioapic->gsi_base); | ||
95 | pci_release_region(dev, 0); | ||
96 | pci_disable_device(dev); | ||
97 | kfree(ioapic); | ||
98 | } | ||
99 | |||
100 | |||
101 | static struct pci_device_id ioapic_devices[] = { | ||
102 | { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | ||
103 | PCI_CLASS_SYSTEM_PIC_IOAPIC << 8, 0xffff00, }, | ||
104 | { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | ||
105 | PCI_CLASS_SYSTEM_PIC_IOXAPIC << 8, 0xffff00, }, | ||
106 | { } | ||
107 | }; | ||
108 | |||
109 | static struct pci_driver ioapic_driver = { | ||
110 | .name = "ioapic", | ||
111 | .id_table = ioapic_devices, | ||
112 | .probe = ioapic_probe, | ||
113 | .remove = __devexit_p(ioapic_remove), | ||
114 | }; | ||
115 | |||
116 | static int __init ioapic_init(void) | ||
117 | { | ||
118 | return pci_register_driver(&ioapic_driver); | ||
119 | } | ||
120 | |||
121 | static void __exit ioapic_exit(void) | ||
122 | { | ||
123 | pci_unregister_driver(&ioapic_driver); | ||
124 | } | ||
125 | |||
126 | module_init(ioapic_init); | ||
127 | module_exit(ioapic_exit); | ||