x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata

This patch introduces struct pci_sysdata to x86 and x86-64, and
converts the existing two users (NUMA, Calgary) to use it.

This lays the groundwork for having other users of sysdata, such as
the PCI domains work.

The Calgary bits are tested, the NUMA bits just look ok.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 27 insertions, 5 deletions

diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index b33aea845f58..bc8a44bddaa7 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -8,20 +8,42 @@
 struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
 {
         struct pci_bus *bus;
+        struct pci_sysdata *sd;
+        int pxm;
+
+        /* Allocate per-root-bus (not per bus) arch-specific data.
+         * TODO: leak; this memory is never freed.
+         * It's arguable whether it's worth the trouble to care.
+         */
+        sd = kzalloc(sizeof(*sd), GFP_KERNEL);
+        if (!sd) {
+                printk(KERN_ERR "PCI: OOM, not probing PCI bus %02x\n", busnum);
+                return NULL;
+        }
 
         if (domain != 0) {
                 printk(KERN_WARNING "PCI: Multiple domains not supported\n");
+                kfree(sd);
                 return NULL;
         }
 
-        bus = pcibios_scan_root(busnum);
+        sd->node = -1;
+
+        pxm = acpi_get_pxm(device->handle);
+#ifdef CONFIG_ACPI_NUMA
+        if (pxm >= 0)
+                sd->node = pxm_to_node(pxm);
+#endif
+
+        bus = pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd);
+        if (!bus)
+                kfree(sd);
+
 #ifdef CONFIG_ACPI_NUMA
         if (bus != NULL) {
-                int pxm = acpi_get_pxm(device->handle);
                 if (pxm >= 0) {
-                        bus->sysdata = (void *)(unsigned long)pxm_to_node(pxm);
-                        printk("bus %d -> pxm %d -> node %ld\n",
-                                busnum, pxm, (long)(bus->sysdata));
+                        printk("bus %d -> pxm %d -> node %d\n",
+                                busnum, pxm, sd->node);
                 }
         }
 #endif