Skip to contentSkip to conversation

x86: k8 numa register active regions later

PATCH Applied Yinghai Lu 2 participants 2 messages Jan 6, 2009

Subsystems (2)
lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86: k8 numa register active regions later

Impact: clean up

don't register early, so we don't need to clear actived regions if it fail to get node hash shift or wild set in nb config.

also remove nodeids array that is not needed

---
 arch/x86/mm/k8topology_64.c |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
arch/x86/mm/k8topology_64.c +9 -11
Index: linux-2.6/arch/x86/mm/k8topology_64.c
===================================================================
@@ -81,7 +81,6 @@ int __init k8_scan_nodes(unsigned long s
 	unsigned numnodes, cores, bits, apicid_base;
 	unsigned long prevbase;
 	struct bootnode nodes[8];
-	unsigned char nodeids[8];
 	int i, j, nb, found = 0;
 	u32 nodeid, reg;
 
@@ -110,7 +109,6 @@ int __init k8_scan_nodes(unsigned long s
 		limit = read_pci_config(0, nb, 1, 0x44 + i*8);
 
 		nodeid = limit & 7;
-		nodeids[i] = nodeid;
 		if ((base & 3) == 0) {
 			if (i < numnodes)
 				printk("Skipping disabled node %d\n", i);
@@ -179,9 +177,6 @@ int __init k8_scan_nodes(unsigned long s
 
 		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;
 
@@ -211,12 +206,15 @@ int __init k8_scan_nodes(unsigned long s
 	}
 
 	for (i = 0; i < 8; i++) {
-		if (nodes[i].start != nodes[i].end) {
-			nodeid = nodeids[i];
-			for (j = apicid_base; j < cores + apicid_base; j++)
-				apicid_to_node[(nodeid << bits) + j] = i;
-			setup_node_bootmem(i, nodes[i].start, nodes[i].end);
-		}
+		if (nodes[i].start == nodes[i].end)
+			continue;
+
+		e820_register_active_regions(i,
+				nodes[i].start >> PAGE_SHIFT,
+				nodes[i].end >> PAGE_SHIFT);
+		for (j = apicid_base; j < cores + apicid_base; j++)
+			apicid_to_node[(i << bits) + j] = i;
+		setup_node_bootmem(i, nodes[i].start, nodes[i].end);
 	}
 
 	numa_init_array();
Applied
#1 lore raw
Quoted 11 lines · Yinghai Lu

Impact: clean up

don't register early, so we don't need to clear actived regions if it fail to get node hash shift or wild set in nb config.

also remove nodeids array that is not needed

---
 arch/x86/mm/k8topology_64.c |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

applied to tip/x86/numa, thanks Yinghai!

Ingo