Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 1 | /* |
Hans Rosenfeld | eec1d4f | 2010-10-29 17:14:30 +0200 | [diff] [blame] | 2 | * AMD NUMA support. |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 3 | * Discover the memory map and associated nodes. |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 4 | * |
Hans Rosenfeld | eec1d4f | 2010-10-29 17:14:30 +0200 | [diff] [blame] | 5 | * This version reads it directly from the AMD northbridge. |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 6 | * |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 7 | * Copyright 2002,2003 Andi Kleen, SuSE Labs. |
| 8 | */ |
| 9 | #include <linux/kernel.h> |
| 10 | #include <linux/init.h> |
| 11 | #include <linux/string.h> |
| 12 | #include <linux/module.h> |
| 13 | #include <linux/nodemask.h> |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 14 | #include <linux/memblock.h> |
| 15 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 16 | #include <asm/io.h> |
| 17 | #include <linux/pci_ids.h> |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 18 | #include <linux/acpi.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 19 | #include <asm/types.h> |
| 20 | #include <asm/mmzone.h> |
| 21 | #include <asm/proto.h> |
| 22 | #include <asm/e820.h> |
| 23 | #include <asm/pci-direct.h> |
| 24 | #include <asm/numa.h> |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 25 | #include <asm/mpspec.h> |
| 26 | #include <asm/apic.h> |
Andreas Herrmann | 23ac4ae | 2010-09-17 18:03:43 +0200 | [diff] [blame] | 27 | #include <asm/amd_nb.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 28 | |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 29 | static struct bootnode __initdata nodes[8]; |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 30 | static unsigned char __initdata nodeids[8]; |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 31 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 32 | static __init int find_northbridge(void) |
| 33 | { |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 34 | int num; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 35 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 36 | for (num = 0; num < 32; num++) { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 37 | u32 header; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 38 | |
| 39 | header = read_pci_config(0, num, 0, 0x00); |
Joachim Deguara | bb4a1d6 | 2008-01-30 13:34:12 +0100 | [diff] [blame] | 40 | if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16)) && |
| 41 | header != (PCI_VENDOR_ID_AMD | (0x1200<<16)) && |
| 42 | header != (PCI_VENDOR_ID_AMD | (0x1300<<16))) |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 43 | continue; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 44 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 45 | header = read_pci_config(0, num, 1, 0x00); |
Joachim Deguara | bb4a1d6 | 2008-01-30 13:34:12 +0100 | [diff] [blame] | 46 | if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16)) && |
| 47 | header != (PCI_VENDOR_ID_AMD | (0x1201<<16)) && |
| 48 | header != (PCI_VENDOR_ID_AMD | (0x1301<<16))) |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 49 | continue; |
| 50 | return num; |
| 51 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 52 | |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 53 | return -ENOENT; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 54 | } |
| 55 | |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 56 | static __init void early_get_boot_cpu_id(void) |
| 57 | { |
| 58 | /* |
Robert Richter | f6e9456c | 2010-07-21 19:03:58 +0200 | [diff] [blame] | 59 | * need to get the APIC ID of the BSP so can use that to |
Hans Rosenfeld | eec1d4f | 2010-10-29 17:14:30 +0200 | [diff] [blame] | 60 | * create apicid_to_node in amd_scan_nodes() |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 61 | */ |
Yinghai Lu | a4caa18 | 2008-06-19 12:15:01 -0700 | [diff] [blame] | 62 | #ifdef CONFIG_X86_MPPARSE |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 63 | /* |
| 64 | * get boot-time SMP configuration: |
| 65 | */ |
| 66 | if (smp_found_config) |
| 67 | early_get_smp_config(); |
Yinghai Lu | a4caa18 | 2008-06-19 12:15:01 -0700 | [diff] [blame] | 68 | #endif |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 69 | } |
| 70 | |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 71 | int __init amd_numa_init(void) |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 72 | { |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 73 | unsigned long start = PFN_PHYS(0); |
| 74 | unsigned long end = PFN_PHYS(max_pfn); |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 75 | unsigned numnodes; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 76 | unsigned long prevbase; |
Tejun Heo | 99df738 | 2011-02-16 12:13:07 +0100 | [diff] [blame^] | 77 | int i, nb; |
Thomas Gleixner | d34c089 | 2008-05-12 15:43:35 +0200 | [diff] [blame] | 78 | u32 nodeid, reg; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 79 | |
Andi Kleen | 0637a70 | 2006-09-26 10:52:41 +0200 | [diff] [blame] | 80 | if (!early_pci_allowed()) |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 81 | return -EINVAL; |
Andi Kleen | 0637a70 | 2006-09-26 10:52:41 +0200 | [diff] [blame] | 82 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 83 | nb = find_northbridge(); |
| 84 | if (nb < 0) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 85 | return nb; |
| 86 | |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 87 | pr_info("Scanning NUMA topology in Northbridge %d\n", nb); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 88 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 89 | reg = read_pci_config(0, nb, 0, 0x60); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 90 | numnodes = ((reg >> 4) & 0xF) + 1; |
Andi Kleen | 3bea9c9 | 2007-05-02 19:27:21 +0200 | [diff] [blame] | 91 | if (numnodes <= 1) |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 92 | return -ENOENT; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 93 | |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 94 | pr_info("Number of physical nodes %d\n", numnodes); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 95 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 96 | prevbase = 0; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 97 | for (i = 0; i < 8; i++) { |
| 98 | unsigned long base, limit; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 99 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 100 | base = read_pci_config(0, nb, 1, 0x40 + i*8); |
| 101 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); |
| 102 | |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 103 | nodeids[i] = nodeid = limit & 7; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 104 | if ((base & 3) == 0) { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 105 | if (i < numnodes) |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 106 | pr_info("Skipping disabled node %d\n", i); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 107 | continue; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 108 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 109 | if (nodeid >= numnodes) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 110 | pr_info("Ignoring excess node %d (%lx:%lx)\n", nodeid, |
| 111 | base, limit); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 112 | continue; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 113 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 114 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 115 | if (!limit) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 116 | pr_info("Skipping node entry %d (base %lx)\n", |
| 117 | i, base); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 118 | continue; |
| 119 | } |
| 120 | if ((base >> 8) & 3 || (limit >> 8) & 3) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 121 | pr_err("Node %d using interleaving mode %lx/%lx\n", |
| 122 | nodeid, (base >> 8) & 3, (limit >> 8) & 3); |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 123 | return -EINVAL; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 124 | } |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 125 | if (node_isset(nodeid, mem_nodes_parsed)) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 126 | pr_info("Node %d already present, skipping\n", |
| 127 | nodeid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 128 | continue; |
| 129 | } |
| 130 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 131 | limit >>= 16; |
| 132 | limit <<= 24; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 133 | limit |= (1<<24)-1; |
Magnus Damm | ffd10a2 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 134 | limit++; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 135 | |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 136 | if (limit > end) |
| 137 | limit = end; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 138 | if (limit <= base) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 139 | continue; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 140 | |
| 141 | base >>= 16; |
| 142 | base <<= 24; |
| 143 | |
| 144 | if (base < start) |
| 145 | base = start; |
| 146 | if (limit > end) |
| 147 | limit = end; |
| 148 | if (limit == base) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 149 | pr_err("Empty node %d\n", nodeid); |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 150 | continue; |
| 151 | } |
| 152 | if (limit < base) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 153 | pr_err("Node %d bogus settings %lx-%lx.\n", |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 154 | nodeid, base, limit); |
| 155 | continue; |
| 156 | } |
| 157 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 158 | /* Could sort here, but pun for now. Should not happen anyroads. */ |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 159 | if (prevbase > base) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 160 | pr_err("Node map not sorted %lx,%lx\n", |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 161 | prevbase, base); |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 162 | return -EINVAL; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 163 | } |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 164 | |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 165 | pr_info("Node %d MemBase %016lx Limit %016lx\n", |
| 166 | nodeid, base, limit); |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 167 | |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 168 | nodes[nodeid].start = base; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 169 | nodes[nodeid].end = limit; |
| 170 | |
| 171 | prevbase = base; |
| 172 | |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 173 | node_set(nodeid, mem_nodes_parsed); |
| 174 | node_set(nodeid, cpu_nodes_parsed); |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 175 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 176 | |
Tejun Heo | 99df738 | 2011-02-16 12:13:07 +0100 | [diff] [blame^] | 177 | if (!nodes_weight(mem_nodes_parsed)) |
Tejun Heo | 940fed2 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 178 | return -ENOENT; |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 179 | return 0; |
| 180 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 181 | |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 182 | #ifdef CONFIG_NUMA_EMU |
| 183 | static s16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = { |
| 184 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE |
| 185 | }; |
| 186 | |
David Rientjes | a387e95 | 2010-12-22 17:23:56 -0800 | [diff] [blame] | 187 | void __init amd_get_nodes(struct bootnode *physnodes) |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 188 | { |
| 189 | int i; |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 190 | |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 191 | for_each_node_mask(i, mem_nodes_parsed) { |
David Rientjes | a387e95 | 2010-12-22 17:23:56 -0800 | [diff] [blame] | 192 | physnodes[i].start = nodes[i].start; |
| 193 | physnodes[i].end = nodes[i].end; |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 194 | } |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 195 | } |
| 196 | |
| 197 | static int __init find_node_by_addr(unsigned long addr) |
| 198 | { |
| 199 | int ret = NUMA_NO_NODE; |
| 200 | int i; |
| 201 | |
| 202 | for (i = 0; i < 8; i++) |
| 203 | if (addr >= nodes[i].start && addr < nodes[i].end) { |
| 204 | ret = i; |
| 205 | break; |
| 206 | } |
| 207 | return ret; |
| 208 | } |
| 209 | |
| 210 | /* |
| 211 | * For NUMA emulation, fake proximity domain (_PXM) to node id mappings must be |
| 212 | * setup to represent the physical topology but reflect the emulated |
| 213 | * environment. For each emulated node, the real node which it appears on is |
| 214 | * found and a fake pxm to nid mapping is created which mirrors the actual |
| 215 | * locality. node_distance() then represents the correct distances between |
| 216 | * emulated nodes by using the fake acpi mappings to pxms. |
| 217 | */ |
| 218 | void __init amd_fake_nodes(const struct bootnode *nodes, int nr_nodes) |
| 219 | { |
| 220 | unsigned int bits; |
| 221 | unsigned int cores; |
| 222 | unsigned int apicid_base = 0; |
| 223 | int i; |
| 224 | |
| 225 | bits = boot_cpu_data.x86_coreid_bits; |
| 226 | cores = 1 << bits; |
| 227 | early_get_boot_cpu_id(); |
| 228 | if (boot_cpu_physical_apicid > 0) |
| 229 | apicid_base = boot_cpu_physical_apicid; |
| 230 | |
| 231 | for (i = 0; i < nr_nodes; i++) { |
| 232 | int index; |
| 233 | int nid; |
| 234 | int j; |
| 235 | |
| 236 | nid = find_node_by_addr(nodes[i].start); |
| 237 | if (nid == NUMA_NO_NODE) |
| 238 | continue; |
| 239 | |
| 240 | index = nodeids[nid] << bits; |
| 241 | if (fake_apicid_to_node[index + apicid_base] == NUMA_NO_NODE) |
| 242 | for (j = apicid_base; j < cores + apicid_base; j++) |
| 243 | fake_apicid_to_node[index + j] = i; |
| 244 | #ifdef CONFIG_ACPI_NUMA |
| 245 | __acpi_map_pxm_to_node(nid, i); |
| 246 | #endif |
| 247 | } |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 248 | memcpy(__apicid_to_node, fake_apicid_to_node, sizeof(__apicid_to_node)); |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 249 | } |
| 250 | #endif /* CONFIG_NUMA_EMU */ |
| 251 | |
Hans Rosenfeld | eec1d4f | 2010-10-29 17:14:30 +0200 | [diff] [blame] | 252 | int __init amd_scan_nodes(void) |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 253 | { |
| 254 | unsigned int bits; |
| 255 | unsigned int cores; |
| 256 | unsigned int apicid_base; |
| 257 | int i; |
| 258 | |
Suresh Siddha | 6ec6e0d | 2008-03-25 10:14:35 -0700 | [diff] [blame] | 259 | memnode_shift = compute_hash_shift(nodes, 8, NULL); |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 260 | if (memnode_shift < 0) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 261 | pr_err("No NUMA node hash function found. Contact maintainer\n"); |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 262 | return -1; |
| 263 | } |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 264 | pr_info("Using node hash shift of %d\n", memnode_shift); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 265 | |
Yinghai Lu | 3f6e5a1 | 2008-01-30 13:30:39 +0100 | [diff] [blame] | 266 | /* use the coreid bits from early_identify_cpu */ |
| 267 | bits = boot_cpu_data.x86_coreid_bits; |
| 268 | cores = (1<<bits); |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 269 | apicid_base = 0; |
Robert Richter | f6e9456c | 2010-07-21 19:03:58 +0200 | [diff] [blame] | 270 | /* get the APIC ID of the BSP early for systems with apicid lifting */ |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 271 | early_get_boot_cpu_id(); |
| 272 | if (boot_cpu_physical_apicid > 0) { |
David Rientjes | 1af5ba5 | 2009-09-25 15:19:47 -0700 | [diff] [blame] | 273 | pr_info("BSP APIC ID: %02x\n", boot_cpu_physical_apicid); |
Yinghai Lu | cbf9bd6 | 2008-02-19 03:21:06 -0800 | [diff] [blame] | 274 | apicid_base = boot_cpu_physical_apicid; |
| 275 | } |
Yinghai Lu | 3f6e5a1 | 2008-01-30 13:30:39 +0100 | [diff] [blame] | 276 | |
Yinghai Lu | 1411e0e | 2010-12-27 16:48:17 -0800 | [diff] [blame] | 277 | for_each_node_mask(i, node_possible_map) |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 278 | memblock_x86_register_active_regions(i, |
Yinghai Lu | 40bcc69 | 2009-01-05 18:39:01 -0800 | [diff] [blame] | 279 | nodes[i].start >> PAGE_SHIFT, |
| 280 | nodes[i].end >> PAGE_SHIFT); |
Yinghai Lu | 1411e0e | 2010-12-27 16:48:17 -0800 | [diff] [blame] | 281 | init_memory_mapping_high(); |
| 282 | for_each_node_mask(i, node_possible_map) { |
| 283 | int j; |
| 284 | |
Yinghai Lu | 40bcc69 | 2009-01-05 18:39:01 -0800 | [diff] [blame] | 285 | for (j = apicid_base; j < cores + apicid_base; j++) |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 286 | set_apicid_to_node((i << bits) + j, i); |
Yinghai Lu | 40bcc69 | 2009-01-05 18:39:01 -0800 | [diff] [blame] | 287 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 288 | } |
| 289 | |
| 290 | numa_init_array(); |
| 291 | return 0; |
Carlos R. Mafra | 3aa88cd | 2008-01-30 13:32:36 +0100 | [diff] [blame] | 292 | } |