fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / x86_64 / mm / k8topology.c

diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c
index 0825e37..b5b8dba 100644 (file)
--- a/arch/x86_64/mm/k8topology.c
+++ b/arch/x86_64/mm/k8topology.c
@@ -2,9 +2,7 @@
  * AMD K8 NUMA support.
  * Discover the memory map and associated nodes.
  * 
- * Doesn't use the ACPI SRAT table because it has a questionable license.
- * Instead the northbridge registers are read directly. 
- * XXX in 2.5 we could use the generic SRAT code
+ * This version reads it directly from the K8 northbridge.
  * 
  * Copyright 2002,2003 Andi Kleen, SuSE Labs.
  */
@@ -12,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/module.h>
+#include <linux/nodemask.h>
 #include <asm/io.h>
 #include <linux/pci_ids.h>
 #include <asm/types.h>
@@ -44,10 +43,19 @@ static __init int find_northbridge(void)
 int __init k8_scan_nodes(unsigned long start, unsigned long end)
 { 
        unsigned long prevbase;
-       struct node nodes[MAXNODE];
+       struct bootnode nodes[8];
        int nodeid, i, nb; 
+       unsigned char nodeids[8];
        int found = 0;
        u32 reg;
+       unsigned numnodes;
+       nodemask_t nodes_parsed;
+       unsigned dualcore = 0;
+
+       nodes_clear(nodes_parsed);
+
+       if (!early_pci_allowed())
+               return -1;
 
        nb = find_northbridge(); 
        if (nb < 0) 
@@ -56,25 +64,29 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
        printk(KERN_INFO "Scanning NUMA topology in Northbridge %d\n", nb); 
 
        reg = read_pci_config(0, nb, 0, 0x60); 
-       numnodes =  ((reg >> 4) & 7) + 1; 
+       numnodes = ((reg >> 4) & 0xF) + 1;
 
-       printk(KERN_INFO "Number of nodes %d (%x)\n", numnodes, reg);
+       printk(KERN_INFO "Number of nodes %d\n", numnodes);
 
        memset(&nodes,0,sizeof(nodes)); 
        prevbase = 0;
        for (i = 0; i < 8; i++) { 
                unsigned long base,limit; 
-
+               u32 nodeid;
+               
+               /* Undefined before E stepping, but hopefully 0 */
+               dualcore |= ((read_pci_config(0, nb, 3, 0xe8) >> 12) & 3) == 1;
                base = read_pci_config(0, nb, 1, 0x40 + i*8);
                limit = read_pci_config(0, nb, 1, 0x44 + i*8);
 
                nodeid = limit & 7; 
+               nodeids[i] = nodeid;
                if ((base & 3) == 0) { 
-                       if (i < numnodes) 
+                       if (i < numnodes)
                                printk("Skipping disabled node %d\n", i); 
                        continue;
                } 
-               if (nodeid >= numnodes) { 
+               if (nodeid >= numnodes) {
                        printk("Ignoring excess node %d (%lx:%lx)\n", nodeid,
                               base, limit); 
                        continue;
@@ -90,7 +102,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
                               nodeid, (base>>8)&3, (limit>>8) & 3); 
                        return -1; 
                }       
-               if (node_online(nodeid)) { 
+               if (node_isset(nodeid, nodes_parsed)) { 
                        printk(KERN_INFO "Node %d already present. Skipping\n", 
                               nodeid);
                        continue;
@@ -99,6 +111,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
                limit >>= 16; 
                limit <<= 24; 
                limit |= (1<<24)-1;
+               limit++;
 
                if (limit > end_pfn << PAGE_SHIFT)
                        limit = end_pfn << PAGE_SHIFT;
@@ -136,26 +149,32 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
                
                nodes[nodeid].start = base; 
                nodes[nodeid].end = limit;
+               e820_register_active_regions(nodeid,
+                               nodes[nodeid].start >> PAGE_SHIFT,
+                               nodes[nodeid].end >> PAGE_SHIFT);
 
                prevbase = base;
+
+               node_set(nodeid, nodes_parsed);
        } 
 
        if (!found)
                return -1; 
 
-       memnode_shift = compute_hash_shift(nodes);
+       memnode_shift = compute_hash_shift(nodes, 8);
        if (memnode_shift < 0) { 
                printk(KERN_ERR "No NUMA node hash function found. Contact maintainer\n"); 
                return -1; 
        } 
        printk(KERN_INFO "Using node hash shift of %d\n", memnode_shift); 
 
-       for (i = 0; i < MAXNODE; i++) { 
+       for (i = 0; i < 8; i++) {
                if (nodes[i].start != nodes[i].end) { 
-                       /* assume 1:1 NODE:CPU */
-                       cpu_to_node[i] = i; 
-               setup_node_bootmem(i, nodes[i].start, nodes[i].end); 
-       } 
+                       nodeid = nodeids[i];
+                       apicid_to_node[nodeid << dualcore] = i;
+                       apicid_to_node[(nodeid << dualcore) + dualcore] = i;
+                       setup_node_bootmem(i, nodes[i].start, nodes[i].end); 
+               } 
        }
 
        numa_init_array();