[IA64] pcibus_to_node implementation for IA64

pcibus_to_node provides a way for the Linux kernel to identify to which
node a certain pcibus connects to. Allocations of control structures
for devices can then be made on the node where the pci bus is located
to allow local access during interrupt and other device manipulation.

This patch provides a new "node" field in the the pci_controller
structure. The node field will be set based on ACPI information (thanks
to Alex Williamson  <alex.williamson@hp.com for that piece).

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

3 files changed, 16 insertions, 2 deletions

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 720a861f88be..54d9ed444e4a 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -157,6 +157,7 @@ alloc_pci_controller (int seg)
 
         memset(controller, 0, sizeof(*controller));
         controller->segment = seg;
+        controller->node = -1;
         return controller;
 }
 
@@ -288,6 +289,7 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)
         unsigned int windows = 0;
         struct pci_bus *pbus;
         char *name;
+        int pxm;
 
         controller = alloc_pci_controller(domain);
         if (!controller)
@@ -295,10 +297,16 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)
 
         controller->acpi_handle = device->handle;
 
+        pxm = acpi_get_pxm(controller->acpi_handle);
+#ifdef CONFIG_NUMA
+        if (pxm >= 0)
+                controller->node = pxm_to_nid_map[pxm];
+#endif
+
         acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
                         &windows);
-        controller->window = kmalloc(sizeof(*controller->window) * windows,
-                        GFP_KERNEL);
+        controller->window = kmalloc_node(sizeof(*controller->window) * windows,
+                        GFP_KERNEL, controller->node);
         if (!controller->window)
                 goto out2;
 
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 0c4c5d801d3f..8b7237cc84c1 100644
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -128,6 +128,7 @@ struct pci_controller {
         void *acpi_handle;
         void *iommu;
         int segment;
+        int node;               /* nearest node with memory or -1 for global allocation */
 
         unsigned int windows;
         struct pci_window *window;
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index 4e64c2a6b369..399bc29729fd 100644
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -40,6 +40,11 @@
  */
 #define node_to_first_cpu(node) (__ffs(node_to_cpumask(node)))
 
+/*
+ * Determines the node for a given pci bus
+ */
+#define pcibus_to_node(bus) PCI_CONTROLLER(bus)->node
+
 void build_cpu_to_node_map(void);
 
 #define SD_CPU_INIT (struct sched_domain) {             \