Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 1 | /* |
| 2 | * pSeries NUMA support |
| 3 | * |
| 4 | * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM |
| 5 | * |
| 6 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License |
| 8 | * as published by the Free Software Foundation; either version |
| 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ |
| 11 | #include <linux/threads.h> |
| 12 | #include <linux/bootmem.h> |
| 13 | #include <linux/init.h> |
| 14 | #include <linux/mm.h> |
| 15 | #include <linux/mmzone.h> |
| 16 | #include <linux/module.h> |
| 17 | #include <linux/nodemask.h> |
| 18 | #include <linux/cpu.h> |
| 19 | #include <linux/notifier.h> |
David S. Miller | d9b2b2a | 2008-02-13 16:56:49 -0800 | [diff] [blame] | 20 | #include <linux/lmb.h> |
Michael Ellerman | 6df1646 | 2008-02-14 11:37:49 +1100 | [diff] [blame] | 21 | #include <linux/of.h> |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 22 | #include <asm/sparsemem.h> |
David S. Miller | d9b2b2a | 2008-02-13 16:56:49 -0800 | [diff] [blame] | 23 | #include <asm/prom.h> |
Paul Mackerras | cf00a8d | 2005-10-31 13:07:02 +1100 | [diff] [blame] | 24 | #include <asm/system.h> |
Paul Mackerras | 2249ca9 | 2005-11-07 13:18:13 +1100 | [diff] [blame] | 25 | #include <asm/smp.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 26 | |
| 27 | static int numa_enabled = 1; |
| 28 | |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 29 | static char *cmdline __initdata; |
| 30 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 31 | static int numa_debug; |
| 32 | #define dbg(args...) if (numa_debug) { printk(KERN_INFO args); } |
| 33 | |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 34 | int numa_cpu_lookup_table[NR_CPUS]; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 35 | cpumask_t numa_cpumask_lookup_table[MAX_NUMNODES]; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 36 | struct pglist_data *node_data[MAX_NUMNODES]; |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 37 | |
| 38 | EXPORT_SYMBOL(numa_cpu_lookup_table); |
| 39 | EXPORT_SYMBOL(numa_cpumask_lookup_table); |
| 40 | EXPORT_SYMBOL(node_data); |
| 41 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 42 | static int min_common_depth; |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 43 | static int n_mem_addr_cells, n_mem_size_cells; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 44 | |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 45 | static int __cpuinit fake_numa_create_new_node(unsigned long end_pfn, |
| 46 | unsigned int *nid) |
| 47 | { |
| 48 | unsigned long long mem; |
| 49 | char *p = cmdline; |
| 50 | static unsigned int fake_nid; |
| 51 | static unsigned long long curr_boundary; |
| 52 | |
| 53 | /* |
| 54 | * Modify node id, iff we started creating NUMA nodes |
| 55 | * We want to continue from where we left of the last time |
| 56 | */ |
| 57 | if (fake_nid) |
| 58 | *nid = fake_nid; |
| 59 | /* |
| 60 | * In case there are no more arguments to parse, the |
| 61 | * node_id should be the same as the last fake node id |
| 62 | * (we've handled this above). |
| 63 | */ |
| 64 | if (!p) |
| 65 | return 0; |
| 66 | |
| 67 | mem = memparse(p, &p); |
| 68 | if (!mem) |
| 69 | return 0; |
| 70 | |
| 71 | if (mem < curr_boundary) |
| 72 | return 0; |
| 73 | |
| 74 | curr_boundary = mem; |
| 75 | |
| 76 | if ((end_pfn << PAGE_SHIFT) > mem) { |
| 77 | /* |
| 78 | * Skip commas and spaces |
| 79 | */ |
| 80 | while (*p == ',' || *p == ' ' || *p == '\t') |
| 81 | p++; |
| 82 | |
| 83 | cmdline = p; |
| 84 | fake_nid++; |
| 85 | *nid = fake_nid; |
| 86 | dbg("created new fake_node with id %d\n", fake_nid); |
| 87 | return 1; |
| 88 | } |
| 89 | return 0; |
| 90 | } |
| 91 | |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 92 | /* |
| 93 | * get_active_region_work_fn - A helper function for get_node_active_region |
| 94 | * Returns datax set to the start_pfn and end_pfn if they contain |
| 95 | * the initial value of datax->start_pfn between them |
| 96 | * @start_pfn: start page(inclusive) of region to check |
| 97 | * @end_pfn: end page(exclusive) of region to check |
| 98 | * @datax: comes in with ->start_pfn set to value to search for and |
| 99 | * goes out with active range if it contains it |
| 100 | * Returns 1 if search value is in range else 0 |
| 101 | */ |
| 102 | static int __init get_active_region_work_fn(unsigned long start_pfn, |
| 103 | unsigned long end_pfn, void *datax) |
| 104 | { |
| 105 | struct node_active_region *data; |
| 106 | data = (struct node_active_region *)datax; |
| 107 | |
| 108 | if (start_pfn <= data->start_pfn && end_pfn > data->start_pfn) { |
| 109 | data->start_pfn = start_pfn; |
| 110 | data->end_pfn = end_pfn; |
| 111 | return 1; |
| 112 | } |
| 113 | return 0; |
| 114 | |
| 115 | } |
| 116 | |
| 117 | /* |
| 118 | * get_node_active_region - Return active region containing start_pfn |
Jon Tollefson | e817037 | 2008-10-16 18:59:43 +0000 | [diff] [blame] | 119 | * Active range returned is empty if none found. |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 120 | * @start_pfn: The page to return the region for. |
| 121 | * @node_ar: Returned set to the active region containing start_pfn |
| 122 | */ |
| 123 | static void __init get_node_active_region(unsigned long start_pfn, |
| 124 | struct node_active_region *node_ar) |
| 125 | { |
| 126 | int nid = early_pfn_to_nid(start_pfn); |
| 127 | |
| 128 | node_ar->nid = nid; |
| 129 | node_ar->start_pfn = start_pfn; |
Jon Tollefson | e817037 | 2008-10-16 18:59:43 +0000 | [diff] [blame] | 130 | node_ar->end_pfn = start_pfn; |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 131 | work_with_active_regions(nid, get_active_region_work_fn, node_ar); |
| 132 | } |
| 133 | |
Nathan Lynch | 2e5ce39 | 2006-03-20 18:35:15 -0600 | [diff] [blame] | 134 | static void __cpuinit map_cpu_to_node(int cpu, int node) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 135 | { |
| 136 | numa_cpu_lookup_table[cpu] = node; |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 137 | |
Nathan Lynch | bf4b85b | 2006-03-20 18:34:45 -0600 | [diff] [blame] | 138 | dbg("adding cpu %d to node %d\n", cpu, node); |
| 139 | |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 140 | if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node]))) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 141 | cpu_set(cpu, numa_cpumask_lookup_table[node]); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 142 | } |
| 143 | |
| 144 | #ifdef CONFIG_HOTPLUG_CPU |
| 145 | static void unmap_cpu_from_node(unsigned long cpu) |
| 146 | { |
| 147 | int node = numa_cpu_lookup_table[cpu]; |
| 148 | |
| 149 | dbg("removing cpu %lu from node %d\n", cpu, node); |
| 150 | |
| 151 | if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) { |
| 152 | cpu_clear(cpu, numa_cpumask_lookup_table[node]); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 153 | } else { |
| 154 | printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n", |
| 155 | cpu, node); |
| 156 | } |
| 157 | } |
| 158 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 159 | |
Nathan Lynch | 2e5ce39 | 2006-03-20 18:35:15 -0600 | [diff] [blame] | 160 | static struct device_node * __cpuinit find_cpu_node(unsigned int cpu) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 161 | { |
| 162 | unsigned int hw_cpuid = get_hard_smp_processor_id(cpu); |
| 163 | struct device_node *cpu_node = NULL; |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 164 | const unsigned int *interrupt_server, *reg; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 165 | int len; |
| 166 | |
| 167 | while ((cpu_node = of_find_node_by_type(cpu_node, "cpu")) != NULL) { |
| 168 | /* Try interrupt server first */ |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 169 | interrupt_server = of_get_property(cpu_node, |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 170 | "ibm,ppc-interrupt-server#s", &len); |
| 171 | |
| 172 | len = len / sizeof(u32); |
| 173 | |
| 174 | if (interrupt_server && (len > 0)) { |
| 175 | while (len--) { |
| 176 | if (interrupt_server[len] == hw_cpuid) |
| 177 | return cpu_node; |
| 178 | } |
| 179 | } else { |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 180 | reg = of_get_property(cpu_node, "reg", &len); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 181 | if (reg && (len > 0) && (reg[0] == hw_cpuid)) |
| 182 | return cpu_node; |
| 183 | } |
| 184 | } |
| 185 | |
| 186 | return NULL; |
| 187 | } |
| 188 | |
| 189 | /* must hold reference to node during call */ |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 190 | static const int *of_get_associativity(struct device_node *dev) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 191 | { |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 192 | return of_get_property(dev, "ibm,associativity", NULL); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 193 | } |
| 194 | |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 195 | /* |
| 196 | * Returns the property linux,drconf-usable-memory if |
| 197 | * it exists (the property exists only in kexec/kdump kernels, |
| 198 | * added by kexec-tools) |
| 199 | */ |
| 200 | static const u32 *of_get_usable_memory(struct device_node *memory) |
| 201 | { |
| 202 | const u32 *prop; |
| 203 | u32 len; |
| 204 | prop = of_get_property(memory, "linux,drconf-usable-memory", &len); |
| 205 | if (!prop || len < sizeof(unsigned int)) |
| 206 | return 0; |
| 207 | return prop; |
| 208 | } |
| 209 | |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 210 | /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa |
| 211 | * info is found. |
| 212 | */ |
Jeremy Kerr | 953039c | 2006-05-01 12:16:12 -0700 | [diff] [blame] | 213 | static int of_node_to_nid_single(struct device_node *device) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 214 | { |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 215 | int nid = -1; |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 216 | const unsigned int *tmp; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 217 | |
| 218 | if (min_common_depth == -1) |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 219 | goto out; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 220 | |
| 221 | tmp = of_get_associativity(device); |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 222 | if (!tmp) |
| 223 | goto out; |
| 224 | |
| 225 | if (tmp[0] >= min_common_depth) |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 226 | nid = tmp[min_common_depth]; |
Nathan Lynch | bc16a75 | 2006-03-20 18:36:15 -0600 | [diff] [blame] | 227 | |
| 228 | /* POWER4 LPAR uses 0xffff as invalid node */ |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 229 | if (nid == 0xffff || nid >= MAX_NUMNODES) |
| 230 | nid = -1; |
| 231 | out: |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 232 | return nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 233 | } |
| 234 | |
Jeremy Kerr | 953039c | 2006-05-01 12:16:12 -0700 | [diff] [blame] | 235 | /* Walk the device tree upwards, looking for an associativity id */ |
| 236 | int of_node_to_nid(struct device_node *device) |
| 237 | { |
| 238 | struct device_node *tmp; |
| 239 | int nid = -1; |
| 240 | |
| 241 | of_node_get(device); |
| 242 | while (device) { |
| 243 | nid = of_node_to_nid_single(device); |
| 244 | if (nid != -1) |
| 245 | break; |
| 246 | |
| 247 | tmp = device; |
| 248 | device = of_get_parent(tmp); |
| 249 | of_node_put(tmp); |
| 250 | } |
| 251 | of_node_put(device); |
| 252 | |
| 253 | return nid; |
| 254 | } |
| 255 | EXPORT_SYMBOL_GPL(of_node_to_nid); |
| 256 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 257 | /* |
| 258 | * In theory, the "ibm,associativity" property may contain multiple |
| 259 | * associativity lists because a resource may be multiply connected |
| 260 | * into the machine. This resource then has different associativity |
| 261 | * characteristics relative to its multiple connections. We ignore |
| 262 | * this for now. We also assume that all cpu and memory sets have |
| 263 | * their distances represented at a common level. This won't be |
Uwe Kleine-König | 1b3c371 | 2007-02-17 19:23:03 +0100 | [diff] [blame] | 264 | * true for hierarchical NUMA. |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 265 | * |
| 266 | * In any case the ibm,associativity-reference-points should give |
| 267 | * the correct depth for a normal NUMA system. |
| 268 | * |
| 269 | * - Dave Hansen <haveblue@us.ibm.com> |
| 270 | */ |
| 271 | static int __init find_min_common_depth(void) |
| 272 | { |
| 273 | int depth; |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 274 | const unsigned int *ref_points; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 275 | struct device_node *rtas_root; |
| 276 | unsigned int len; |
| 277 | |
| 278 | rtas_root = of_find_node_by_path("/rtas"); |
| 279 | |
| 280 | if (!rtas_root) |
| 281 | return -1; |
| 282 | |
| 283 | /* |
| 284 | * this property is 2 32-bit integers, each representing a level of |
| 285 | * depth in the associativity nodes. The first is for an SMP |
| 286 | * configuration (should be all 0's) and the second is for a normal |
| 287 | * NUMA configuration. |
| 288 | */ |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 289 | ref_points = of_get_property(rtas_root, |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 290 | "ibm,associativity-reference-points", &len); |
| 291 | |
| 292 | if ((len >= 1) && ref_points) { |
| 293 | depth = ref_points[1]; |
| 294 | } else { |
Nathan Lynch | bf4b85b | 2006-03-20 18:34:45 -0600 | [diff] [blame] | 295 | dbg("NUMA: ibm,associativity-reference-points not found.\n"); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 296 | depth = -1; |
| 297 | } |
| 298 | of_node_put(rtas_root); |
| 299 | |
| 300 | return depth; |
| 301 | } |
| 302 | |
Mike Kravetz | 84c9fdd | 2005-11-30 13:47:23 -0800 | [diff] [blame] | 303 | static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 304 | { |
| 305 | struct device_node *memory = NULL; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 306 | |
| 307 | memory = of_find_node_by_type(memory, "memory"); |
Paul Mackerras | 54c2331 | 2005-12-05 15:50:39 +1100 | [diff] [blame] | 308 | if (!memory) |
Mike Kravetz | 84c9fdd | 2005-11-30 13:47:23 -0800 | [diff] [blame] | 309 | panic("numa.c: No memory nodes found!"); |
Paul Mackerras | 54c2331 | 2005-12-05 15:50:39 +1100 | [diff] [blame] | 310 | |
Stephen Rothwell | a8bda5d | 2007-04-03 10:56:50 +1000 | [diff] [blame] | 311 | *n_addr_cells = of_n_addr_cells(memory); |
Stephen Rothwell | 9213fee | 2007-04-03 10:57:48 +1000 | [diff] [blame] | 312 | *n_size_cells = of_n_size_cells(memory); |
Mike Kravetz | 84c9fdd | 2005-11-30 13:47:23 -0800 | [diff] [blame] | 313 | of_node_put(memory); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 314 | } |
| 315 | |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 316 | static unsigned long __devinit read_n_cells(int n, const unsigned int **buf) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 317 | { |
| 318 | unsigned long result = 0; |
| 319 | |
| 320 | while (n--) { |
| 321 | result = (result << 32) | **buf; |
| 322 | (*buf)++; |
| 323 | } |
| 324 | return result; |
| 325 | } |
| 326 | |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 327 | struct of_drconf_cell { |
| 328 | u64 base_addr; |
| 329 | u32 drc_index; |
| 330 | u32 reserved; |
| 331 | u32 aa_index; |
| 332 | u32 flags; |
| 333 | }; |
| 334 | |
| 335 | #define DRCONF_MEM_ASSIGNED 0x00000008 |
| 336 | #define DRCONF_MEM_AI_INVALID 0x00000040 |
| 337 | #define DRCONF_MEM_RESERVED 0x00000080 |
| 338 | |
| 339 | /* |
| 340 | * Read the next lmb list entry from the ibm,dynamic-memory property |
| 341 | * and return the information in the provided of_drconf_cell structure. |
| 342 | */ |
| 343 | static void read_drconf_cell(struct of_drconf_cell *drmem, const u32 **cellp) |
| 344 | { |
| 345 | const u32 *cp; |
| 346 | |
| 347 | drmem->base_addr = read_n_cells(n_mem_addr_cells, cellp); |
| 348 | |
| 349 | cp = *cellp; |
| 350 | drmem->drc_index = cp[0]; |
| 351 | drmem->reserved = cp[1]; |
| 352 | drmem->aa_index = cp[2]; |
| 353 | drmem->flags = cp[3]; |
| 354 | |
| 355 | *cellp = cp + 4; |
| 356 | } |
| 357 | |
| 358 | /* |
| 359 | * Retreive and validate the ibm,dynamic-memory property of the device tree. |
| 360 | * |
| 361 | * The layout of the ibm,dynamic-memory property is a number N of lmb |
| 362 | * list entries followed by N lmb list entries. Each lmb list entry |
| 363 | * contains information as layed out in the of_drconf_cell struct above. |
| 364 | */ |
| 365 | static int of_get_drconf_memory(struct device_node *memory, const u32 **dm) |
| 366 | { |
| 367 | const u32 *prop; |
| 368 | u32 len, entries; |
| 369 | |
| 370 | prop = of_get_property(memory, "ibm,dynamic-memory", &len); |
| 371 | if (!prop || len < sizeof(unsigned int)) |
| 372 | return 0; |
| 373 | |
| 374 | entries = *prop++; |
| 375 | |
| 376 | /* Now that we know the number of entries, revalidate the size |
| 377 | * of the property read in to ensure we have everything |
| 378 | */ |
| 379 | if (len < (entries * (n_mem_addr_cells + 4) + 1) * sizeof(unsigned int)) |
| 380 | return 0; |
| 381 | |
| 382 | *dm = prop; |
| 383 | return entries; |
| 384 | } |
| 385 | |
| 386 | /* |
| 387 | * Retreive and validate the ibm,lmb-size property for drconf memory |
| 388 | * from the device tree. |
| 389 | */ |
| 390 | static u64 of_get_lmb_size(struct device_node *memory) |
| 391 | { |
| 392 | const u32 *prop; |
| 393 | u32 len; |
| 394 | |
| 395 | prop = of_get_property(memory, "ibm,lmb-size", &len); |
| 396 | if (!prop || len < sizeof(unsigned int)) |
| 397 | return 0; |
| 398 | |
| 399 | return read_n_cells(n_mem_size_cells, &prop); |
| 400 | } |
| 401 | |
| 402 | struct assoc_arrays { |
| 403 | u32 n_arrays; |
| 404 | u32 array_sz; |
| 405 | const u32 *arrays; |
| 406 | }; |
| 407 | |
| 408 | /* |
| 409 | * Retreive and validate the list of associativity arrays for drconf |
| 410 | * memory from the ibm,associativity-lookup-arrays property of the |
| 411 | * device tree.. |
| 412 | * |
| 413 | * The layout of the ibm,associativity-lookup-arrays property is a number N |
| 414 | * indicating the number of associativity arrays, followed by a number M |
| 415 | * indicating the size of each associativity array, followed by a list |
| 416 | * of N associativity arrays. |
| 417 | */ |
| 418 | static int of_get_assoc_arrays(struct device_node *memory, |
| 419 | struct assoc_arrays *aa) |
| 420 | { |
| 421 | const u32 *prop; |
| 422 | u32 len; |
| 423 | |
| 424 | prop = of_get_property(memory, "ibm,associativity-lookup-arrays", &len); |
| 425 | if (!prop || len < 2 * sizeof(unsigned int)) |
| 426 | return -1; |
| 427 | |
| 428 | aa->n_arrays = *prop++; |
| 429 | aa->array_sz = *prop++; |
| 430 | |
| 431 | /* Now that we know the number of arrrays and size of each array, |
| 432 | * revalidate the size of the property read in. |
| 433 | */ |
| 434 | if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int)) |
| 435 | return -1; |
| 436 | |
| 437 | aa->arrays = prop; |
| 438 | return 0; |
| 439 | } |
| 440 | |
| 441 | /* |
| 442 | * This is like of_node_to_nid_single() for memory represented in the |
| 443 | * ibm,dynamic-reconfiguration-memory node. |
| 444 | */ |
| 445 | static int of_drconf_to_nid_single(struct of_drconf_cell *drmem, |
| 446 | struct assoc_arrays *aa) |
| 447 | { |
| 448 | int default_nid = 0; |
| 449 | int nid = default_nid; |
| 450 | int index; |
| 451 | |
| 452 | if (min_common_depth > 0 && min_common_depth <= aa->array_sz && |
| 453 | !(drmem->flags & DRCONF_MEM_AI_INVALID) && |
| 454 | drmem->aa_index < aa->n_arrays) { |
| 455 | index = drmem->aa_index * aa->array_sz + min_common_depth - 1; |
| 456 | nid = aa->arrays[index]; |
| 457 | |
| 458 | if (nid == 0xffff || nid >= MAX_NUMNODES) |
| 459 | nid = default_nid; |
| 460 | } |
| 461 | |
| 462 | return nid; |
| 463 | } |
| 464 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 465 | /* |
| 466 | * Figure out to which domain a cpu belongs and stick it there. |
| 467 | * Return the id of the domain used. |
| 468 | */ |
Nathan Lynch | 2e5ce39 | 2006-03-20 18:35:15 -0600 | [diff] [blame] | 469 | static int __cpuinit numa_setup_cpu(unsigned long lcpu) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 470 | { |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 471 | int nid = 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 472 | struct device_node *cpu = find_cpu_node(lcpu); |
| 473 | |
| 474 | if (!cpu) { |
| 475 | WARN_ON(1); |
| 476 | goto out; |
| 477 | } |
| 478 | |
Jeremy Kerr | 953039c | 2006-05-01 12:16:12 -0700 | [diff] [blame] | 479 | nid = of_node_to_nid_single(cpu); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 480 | |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 481 | if (nid < 0 || !node_online(nid)) |
| 482 | nid = any_online_node(NODE_MASK_ALL); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 483 | out: |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 484 | map_cpu_to_node(lcpu, nid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 485 | |
| 486 | of_node_put(cpu); |
| 487 | |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 488 | return nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 489 | } |
| 490 | |
Chandra Seetharaman | 74b85f3 | 2006-06-27 02:54:09 -0700 | [diff] [blame] | 491 | static int __cpuinit cpu_numa_callback(struct notifier_block *nfb, |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 492 | unsigned long action, |
| 493 | void *hcpu) |
| 494 | { |
| 495 | unsigned long lcpu = (unsigned long)hcpu; |
| 496 | int ret = NOTIFY_DONE; |
| 497 | |
| 498 | switch (action) { |
| 499 | case CPU_UP_PREPARE: |
Rafael J. Wysocki | 8bb7844 | 2007-05-09 02:35:10 -0700 | [diff] [blame] | 500 | case CPU_UP_PREPARE_FROZEN: |
Nathan Lynch | 2b26122 | 2006-03-20 18:37:15 -0600 | [diff] [blame] | 501 | numa_setup_cpu(lcpu); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 502 | ret = NOTIFY_OK; |
| 503 | break; |
| 504 | #ifdef CONFIG_HOTPLUG_CPU |
| 505 | case CPU_DEAD: |
Rafael J. Wysocki | 8bb7844 | 2007-05-09 02:35:10 -0700 | [diff] [blame] | 506 | case CPU_DEAD_FROZEN: |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 507 | case CPU_UP_CANCELED: |
Rafael J. Wysocki | 8bb7844 | 2007-05-09 02:35:10 -0700 | [diff] [blame] | 508 | case CPU_UP_CANCELED_FROZEN: |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 509 | unmap_cpu_from_node(lcpu); |
| 510 | break; |
| 511 | ret = NOTIFY_OK; |
| 512 | #endif |
| 513 | } |
| 514 | return ret; |
| 515 | } |
| 516 | |
| 517 | /* |
| 518 | * Check and possibly modify a memory region to enforce the memory limit. |
| 519 | * |
| 520 | * Returns the size the region should have to enforce the memory limit. |
| 521 | * This will either be the original value of size, a truncated value, |
| 522 | * or zero. If the returned value of size is 0 the region should be |
| 523 | * discarded as it lies wholy above the memory limit. |
| 524 | */ |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 525 | static unsigned long __init numa_enforce_memory_limit(unsigned long start, |
| 526 | unsigned long size) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 527 | { |
| 528 | /* |
| 529 | * We use lmb_end_of_DRAM() in here instead of memory_limit because |
| 530 | * we've already adjusted it for the limit and it takes care of |
Milton Miller | fe55249 | 2008-10-20 15:37:04 +0000 | [diff] [blame] | 531 | * having memory holes below the limit. Also, in the case of |
| 532 | * iommu_is_off, memory_limit is not set but is implicitly enforced. |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 533 | */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 534 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 535 | if (start + size <= lmb_end_of_DRAM()) |
| 536 | return size; |
| 537 | |
| 538 | if (start >= lmb_end_of_DRAM()) |
| 539 | return 0; |
| 540 | |
| 541 | return lmb_end_of_DRAM() - start; |
| 542 | } |
| 543 | |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 544 | /* |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 545 | * Reads the counter for a given entry in |
| 546 | * linux,drconf-usable-memory property |
| 547 | */ |
| 548 | static inline int __init read_usm_ranges(const u32 **usm) |
| 549 | { |
| 550 | /* |
| 551 | * For each lmb in ibm,dynamic-memory a corresponding |
| 552 | * entry in linux,drconf-usable-memory property contains |
| 553 | * a counter followed by that many (base, size) duple. |
| 554 | * read the counter from linux,drconf-usable-memory |
| 555 | */ |
| 556 | return read_n_cells(n_mem_size_cells, usm); |
| 557 | } |
| 558 | |
| 559 | /* |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 560 | * Extract NUMA information from the ibm,dynamic-reconfiguration-memory |
| 561 | * node. This assumes n_mem_{addr,size}_cells have been set. |
| 562 | */ |
| 563 | static void __init parse_drconf_memory(struct device_node *memory) |
| 564 | { |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 565 | const u32 *dm, *usm; |
| 566 | unsigned int n, rc, ranges, is_kexec_kdump = 0; |
| 567 | unsigned long lmb_size, base, size, sz; |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 568 | int nid; |
| 569 | struct assoc_arrays aa; |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 570 | |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 571 | n = of_get_drconf_memory(memory, &dm); |
| 572 | if (!n) |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 573 | return; |
| 574 | |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 575 | lmb_size = of_get_lmb_size(memory); |
| 576 | if (!lmb_size) |
| 577 | return; |
| 578 | |
| 579 | rc = of_get_assoc_arrays(memory, &aa); |
| 580 | if (rc) |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 581 | return; |
| 582 | |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 583 | /* check if this is a kexec/kdump kernel */ |
| 584 | usm = of_get_usable_memory(memory); |
| 585 | if (usm != NULL) |
| 586 | is_kexec_kdump = 1; |
| 587 | |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 588 | for (; n != 0; --n) { |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 589 | struct of_drconf_cell drmem; |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 590 | |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 591 | read_drconf_cell(&drmem, &dm); |
| 592 | |
| 593 | /* skip this block if the reserved bit is set in flags (0x80) |
| 594 | or if the block is not assigned to this partition (0x8) */ |
| 595 | if ((drmem.flags & DRCONF_MEM_RESERVED) |
| 596 | || !(drmem.flags & DRCONF_MEM_ASSIGNED)) |
| 597 | continue; |
| 598 | |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 599 | base = drmem.base_addr; |
| 600 | size = lmb_size; |
| 601 | ranges = 1; |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 602 | |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 603 | if (is_kexec_kdump) { |
| 604 | ranges = read_usm_ranges(&usm); |
| 605 | if (!ranges) /* there are no (base, size) duple */ |
| 606 | continue; |
| 607 | } |
| 608 | do { |
| 609 | if (is_kexec_kdump) { |
| 610 | base = read_n_cells(n_mem_addr_cells, &usm); |
| 611 | size = read_n_cells(n_mem_size_cells, &usm); |
| 612 | } |
| 613 | nid = of_drconf_to_nid_single(&drmem, &aa); |
| 614 | fake_numa_create_new_node( |
| 615 | ((base + size) >> PAGE_SHIFT), |
Nathan Fontenot | 8342681 | 2008-07-03 13:35:54 +1000 | [diff] [blame] | 616 | &nid); |
Chandru | cf00085 | 2008-08-30 00:28:16 +1000 | [diff] [blame] | 617 | node_set_online(nid); |
| 618 | sz = numa_enforce_memory_limit(base, size); |
| 619 | if (sz) |
| 620 | add_active_range(nid, base >> PAGE_SHIFT, |
| 621 | (base >> PAGE_SHIFT) |
| 622 | + (sz >> PAGE_SHIFT)); |
| 623 | } while (--ranges); |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 624 | } |
| 625 | } |
| 626 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 627 | static int __init parse_numa_properties(void) |
| 628 | { |
| 629 | struct device_node *cpu = NULL; |
| 630 | struct device_node *memory = NULL; |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 631 | int default_nid = 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 632 | unsigned long i; |
| 633 | |
| 634 | if (numa_enabled == 0) { |
| 635 | printk(KERN_WARNING "NUMA disabled by user\n"); |
| 636 | return -1; |
| 637 | } |
| 638 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 639 | min_common_depth = find_min_common_depth(); |
| 640 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 641 | if (min_common_depth < 0) |
| 642 | return min_common_depth; |
| 643 | |
Nathan Lynch | bf4b85b | 2006-03-20 18:34:45 -0600 | [diff] [blame] | 644 | dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth); |
| 645 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 646 | /* |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 647 | * Even though we connect cpus to numa domains later in SMP |
| 648 | * init, we need to know the node ids now. This is because |
| 649 | * each node to be onlined must have NODE_DATA etc backing it. |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 650 | */ |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 651 | for_each_present_cpu(i) { |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 652 | int nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 653 | |
| 654 | cpu = find_cpu_node(i); |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 655 | BUG_ON(!cpu); |
Jeremy Kerr | 953039c | 2006-05-01 12:16:12 -0700 | [diff] [blame] | 656 | nid = of_node_to_nid_single(cpu); |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 657 | of_node_put(cpu); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 658 | |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 659 | /* |
| 660 | * Don't fall back to default_nid yet -- we will plug |
| 661 | * cpus into nodes once the memory scan has discovered |
| 662 | * the topology. |
| 663 | */ |
| 664 | if (nid < 0) |
| 665 | continue; |
| 666 | node_set_online(nid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 667 | } |
| 668 | |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 669 | get_n_mem_cells(&n_mem_addr_cells, &n_mem_size_cells); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 670 | memory = NULL; |
| 671 | while ((memory = of_find_node_by_type(memory, "memory")) != NULL) { |
| 672 | unsigned long start; |
| 673 | unsigned long size; |
Nathan Lynch | cf950b7 | 2006-03-20 18:35:45 -0600 | [diff] [blame] | 674 | int nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 675 | int ranges; |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 676 | const unsigned int *memcell_buf; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 677 | unsigned int len; |
| 678 | |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 679 | memcell_buf = of_get_property(memory, |
Michael Ellerman | ba75948 | 2005-12-04 18:39:55 +1100 | [diff] [blame] | 680 | "linux,usable-memory", &len); |
| 681 | if (!memcell_buf || len <= 0) |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 682 | memcell_buf = of_get_property(memory, "reg", &len); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 683 | if (!memcell_buf || len <= 0) |
| 684 | continue; |
| 685 | |
Benjamin Herrenschmidt | cc5d018 | 2005-12-13 18:01:21 +1100 | [diff] [blame] | 686 | /* ranges in cell */ |
| 687 | ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 688 | new_range: |
| 689 | /* these are order-sensitive, and modify the buffer pointer */ |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 690 | start = read_n_cells(n_mem_addr_cells, &memcell_buf); |
| 691 | size = read_n_cells(n_mem_size_cells, &memcell_buf); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 692 | |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 693 | /* |
| 694 | * Assumption: either all memory nodes or none will |
| 695 | * have associativity properties. If none, then |
| 696 | * everything goes to default_nid. |
| 697 | */ |
Jeremy Kerr | 953039c | 2006-05-01 12:16:12 -0700 | [diff] [blame] | 698 | nid = of_node_to_nid_single(memory); |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 699 | if (nid < 0) |
| 700 | nid = default_nid; |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 701 | |
| 702 | fake_numa_create_new_node(((start + size) >> PAGE_SHIFT), &nid); |
Nathan Lynch | 482ec7c | 2006-03-20 18:36:45 -0600 | [diff] [blame] | 703 | node_set_online(nid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 704 | |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 705 | if (!(size = numa_enforce_memory_limit(start, size))) { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 706 | if (--ranges) |
| 707 | goto new_range; |
| 708 | else |
| 709 | continue; |
| 710 | } |
| 711 | |
Mel Gorman | c67c3cb | 2006-09-27 01:49:49 -0700 | [diff] [blame] | 712 | add_active_range(nid, start >> PAGE_SHIFT, |
| 713 | (start >> PAGE_SHIFT) + (size >> PAGE_SHIFT)); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 714 | |
| 715 | if (--ranges) |
| 716 | goto new_range; |
| 717 | } |
| 718 | |
Paul Mackerras | 0204568 | 2006-11-29 22:27:42 +1100 | [diff] [blame] | 719 | /* |
| 720 | * Now do the same thing for each LMB listed in the ibm,dynamic-memory |
| 721 | * property in the ibm,dynamic-reconfiguration-memory node. |
| 722 | */ |
| 723 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); |
| 724 | if (memory) |
| 725 | parse_drconf_memory(memory); |
| 726 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 727 | return 0; |
| 728 | } |
| 729 | |
| 730 | static void __init setup_nonnuma(void) |
| 731 | { |
| 732 | unsigned long top_of_ram = lmb_end_of_DRAM(); |
| 733 | unsigned long total_ram = lmb_phys_mem_size(); |
Mel Gorman | c67c3cb | 2006-09-27 01:49:49 -0700 | [diff] [blame] | 734 | unsigned long start_pfn, end_pfn; |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 735 | unsigned int i, nid = 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 736 | |
Olof Johansson | e110b28 | 2006-04-12 15:25:01 -0500 | [diff] [blame] | 737 | printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n", |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 738 | top_of_ram, total_ram); |
Olof Johansson | e110b28 | 2006-04-12 15:25:01 -0500 | [diff] [blame] | 739 | printk(KERN_DEBUG "Memory hole size: %ldMB\n", |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 740 | (top_of_ram - total_ram) >> 20); |
| 741 | |
Mel Gorman | c67c3cb | 2006-09-27 01:49:49 -0700 | [diff] [blame] | 742 | for (i = 0; i < lmb.memory.cnt; ++i) { |
| 743 | start_pfn = lmb.memory.region[i].base >> PAGE_SHIFT; |
| 744 | end_pfn = start_pfn + lmb_size_pages(&lmb.memory, i); |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 745 | |
| 746 | fake_numa_create_new_node(end_pfn, &nid); |
| 747 | add_active_range(nid, start_pfn, end_pfn); |
| 748 | node_set_online(nid); |
Mel Gorman | c67c3cb | 2006-09-27 01:49:49 -0700 | [diff] [blame] | 749 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 750 | } |
| 751 | |
Anton Blanchard | 4b703a2 | 2005-12-13 06:56:47 +1100 | [diff] [blame] | 752 | void __init dump_numa_cpu_topology(void) |
| 753 | { |
| 754 | unsigned int node; |
| 755 | unsigned int cpu, count; |
| 756 | |
| 757 | if (min_common_depth == -1 || !numa_enabled) |
| 758 | return; |
| 759 | |
| 760 | for_each_online_node(node) { |
Olof Johansson | e110b28 | 2006-04-12 15:25:01 -0500 | [diff] [blame] | 761 | printk(KERN_DEBUG "Node %d CPUs:", node); |
Anton Blanchard | 4b703a2 | 2005-12-13 06:56:47 +1100 | [diff] [blame] | 762 | |
| 763 | count = 0; |
| 764 | /* |
| 765 | * If we used a CPU iterator here we would miss printing |
| 766 | * the holes in the cpumap. |
| 767 | */ |
| 768 | for (cpu = 0; cpu < NR_CPUS; cpu++) { |
| 769 | if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) { |
| 770 | if (count == 0) |
| 771 | printk(" %u", cpu); |
| 772 | ++count; |
| 773 | } else { |
| 774 | if (count > 1) |
| 775 | printk("-%u", cpu - 1); |
| 776 | count = 0; |
| 777 | } |
| 778 | } |
| 779 | |
| 780 | if (count > 1) |
| 781 | printk("-%u", NR_CPUS - 1); |
| 782 | printk("\n"); |
| 783 | } |
| 784 | } |
| 785 | |
| 786 | static void __init dump_numa_memory_topology(void) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 787 | { |
| 788 | unsigned int node; |
| 789 | unsigned int count; |
| 790 | |
| 791 | if (min_common_depth == -1 || !numa_enabled) |
| 792 | return; |
| 793 | |
| 794 | for_each_online_node(node) { |
| 795 | unsigned long i; |
| 796 | |
Olof Johansson | e110b28 | 2006-04-12 15:25:01 -0500 | [diff] [blame] | 797 | printk(KERN_DEBUG "Node %d Memory:", node); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 798 | |
| 799 | count = 0; |
| 800 | |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 801 | for (i = 0; i < lmb_end_of_DRAM(); |
| 802 | i += (1 << SECTION_SIZE_BITS)) { |
| 803 | if (early_pfn_to_nid(i >> PAGE_SHIFT) == node) { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 804 | if (count == 0) |
| 805 | printk(" 0x%lx", i); |
| 806 | ++count; |
| 807 | } else { |
| 808 | if (count > 0) |
| 809 | printk("-0x%lx", i); |
| 810 | count = 0; |
| 811 | } |
| 812 | } |
| 813 | |
| 814 | if (count > 0) |
| 815 | printk("-0x%lx", i); |
| 816 | printk("\n"); |
| 817 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 818 | } |
| 819 | |
| 820 | /* |
| 821 | * Allocate some memory, satisfying the lmb or bootmem allocator where |
| 822 | * required. nid is the preferred node and end is the physical address of |
| 823 | * the highest address in the node. |
| 824 | * |
| 825 | * Returns the physical address of the memory. |
| 826 | */ |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 827 | static void __init *careful_allocation(int nid, unsigned long size, |
| 828 | unsigned long align, |
| 829 | unsigned long end_pfn) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 830 | { |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 831 | int new_nid; |
Michael Ellerman | d7a5b2f | 2006-01-25 21:31:28 +1300 | [diff] [blame] | 832 | unsigned long ret = __lmb_alloc_base(size, align, end_pfn << PAGE_SHIFT); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 833 | |
| 834 | /* retry over all memory */ |
| 835 | if (!ret) |
Michael Ellerman | d7a5b2f | 2006-01-25 21:31:28 +1300 | [diff] [blame] | 836 | ret = __lmb_alloc_base(size, align, lmb_end_of_DRAM()); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 837 | |
| 838 | if (!ret) |
| 839 | panic("numa.c: cannot allocate %lu bytes on node %d", |
| 840 | size, nid); |
| 841 | |
| 842 | /* |
Dave Hansen | c555e52 | 2008-12-09 08:21:32 +0000 | [diff] [blame^] | 843 | * We initialize the nodes in numeric order: 0, 1, 2... |
| 844 | * and hand over control from the LMB allocator to the |
| 845 | * bootmem allocator. If this function is called for |
| 846 | * node 5, then we know that all nodes <5 are using the |
| 847 | * bootmem allocator instead of the LMB allocator. |
| 848 | * |
| 849 | * So, check the nid from which this allocation came |
| 850 | * and double check to see if we need to use bootmem |
| 851 | * instead of the LMB. We don't free the LMB memory |
| 852 | * since it would be useless. |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 853 | */ |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 854 | new_nid = early_pfn_to_nid(ret >> PAGE_SHIFT); |
| 855 | if (new_nid < nid) { |
| 856 | ret = (unsigned long)__alloc_bootmem_node(NODE_DATA(new_nid), |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 857 | size, align, 0); |
| 858 | |
| 859 | if (!ret) |
| 860 | panic("numa.c: cannot allocate %lu bytes on node %d", |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 861 | size, new_nid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 862 | |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 863 | ret = __pa(ret); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 864 | |
| 865 | dbg("alloc_bootmem %lx %lx\n", ret, size); |
| 866 | } |
| 867 | |
Anton Blanchard | 45fb6ce | 2005-11-11 14:22:35 +1100 | [diff] [blame] | 868 | return (void *)ret; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 869 | } |
| 870 | |
Chandra Seetharaman | 74b85f3 | 2006-06-27 02:54:09 -0700 | [diff] [blame] | 871 | static struct notifier_block __cpuinitdata ppc64_numa_nb = { |
| 872 | .notifier_call = cpu_numa_callback, |
| 873 | .priority = 1 /* Must run before sched domains notifier. */ |
| 874 | }; |
| 875 | |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 876 | static void mark_reserved_regions_for_nid(int nid) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 877 | { |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 878 | struct pglist_data *node = NODE_DATA(nid); |
| 879 | int i; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 880 | |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 881 | for (i = 0; i < lmb.reserved.cnt; i++) { |
| 882 | unsigned long physbase = lmb.reserved.region[i].base; |
| 883 | unsigned long size = lmb.reserved.region[i].size; |
| 884 | unsigned long start_pfn = physbase >> PAGE_SHIFT; |
| 885 | unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT); |
| 886 | struct node_active_region node_ar; |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 887 | unsigned long node_end_pfn = node->node_start_pfn + |
| 888 | node->node_spanned_pages; |
| 889 | |
| 890 | /* |
| 891 | * Check to make sure that this lmb.reserved area is |
| 892 | * within the bounds of the node that we care about. |
| 893 | * Checking the nid of the start and end points is not |
| 894 | * sufficient because the reserved area could span the |
| 895 | * entire node. |
| 896 | */ |
| 897 | if (end_pfn <= node->node_start_pfn || |
| 898 | start_pfn >= node_end_pfn) |
| 899 | continue; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 900 | |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 901 | get_node_active_region(start_pfn, &node_ar); |
Jon Tollefson | e817037 | 2008-10-16 18:59:43 +0000 | [diff] [blame] | 902 | while (start_pfn < end_pfn && |
| 903 | node_ar.start_pfn < node_ar.end_pfn) { |
| 904 | unsigned long reserve_size = size; |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 905 | /* |
| 906 | * if reserved region extends past active region |
| 907 | * then trim size to active region |
| 908 | */ |
| 909 | if (end_pfn > node_ar.end_pfn) |
Jon Tollefson | e817037 | 2008-10-16 18:59:43 +0000 | [diff] [blame] | 910 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 911 | - (start_pfn << PAGE_SHIFT); |
Dave Hansen | a4c74dd | 2008-12-11 08:36:06 +0000 | [diff] [blame] | 912 | /* |
| 913 | * Only worry about *this* node, others may not |
| 914 | * yet have valid NODE_DATA(). |
| 915 | */ |
| 916 | if (node_ar.nid == nid) { |
| 917 | dbg("reserve_bootmem %lx %lx nid=%d\n", |
| 918 | physbase, reserve_size, node_ar.nid); |
| 919 | reserve_bootmem_node(NODE_DATA(node_ar.nid), |
| 920 | physbase, reserve_size, |
| 921 | BOOTMEM_DEFAULT); |
| 922 | } |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 923 | /* |
| 924 | * if reserved region is contained in the active region |
| 925 | * then done. |
| 926 | */ |
| 927 | if (end_pfn <= node_ar.end_pfn) |
| 928 | break; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 929 | |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 930 | /* |
| 931 | * reserved region extends past the active region |
| 932 | * get next active region that contains this |
| 933 | * reserved region |
| 934 | */ |
| 935 | start_pfn = node_ar.end_pfn; |
| 936 | physbase = start_pfn << PAGE_SHIFT; |
Jon Tollefson | e817037 | 2008-10-16 18:59:43 +0000 | [diff] [blame] | 937 | size = size - reserve_size; |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 938 | get_node_active_region(start_pfn, &node_ar); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 939 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 940 | } |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 941 | } |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 942 | |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 943 | |
| 944 | void __init do_init_bootmem(void) |
| 945 | { |
| 946 | int nid; |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 947 | |
| 948 | min_low_pfn = 0; |
| 949 | max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT; |
| 950 | max_pfn = max_low_pfn; |
| 951 | |
| 952 | if (parse_numa_properties()) |
| 953 | setup_nonnuma(); |
| 954 | else |
| 955 | dump_numa_memory_topology(); |
| 956 | |
| 957 | register_cpu_notifier(&ppc64_numa_nb); |
| 958 | cpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE, |
| 959 | (void *)(unsigned long)boot_cpuid); |
| 960 | |
| 961 | for_each_online_node(nid) { |
| 962 | unsigned long start_pfn, end_pfn; |
| 963 | unsigned long bootmem_paddr; |
| 964 | unsigned long bootmap_pages; |
| 965 | |
| 966 | get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); |
| 967 | |
| 968 | /* |
| 969 | * Allocate the node structure node local if possible |
| 970 | * |
| 971 | * Be careful moving this around, as it relies on all |
| 972 | * previous nodes' bootmem to be initialized and have |
| 973 | * all reserved areas marked. |
| 974 | */ |
| 975 | NODE_DATA(nid) = careful_allocation(nid, |
| 976 | sizeof(struct pglist_data), |
| 977 | SMP_CACHE_BYTES, end_pfn); |
| 978 | NODE_DATA(nid) = __va(NODE_DATA(nid)); |
| 979 | memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); |
| 980 | |
| 981 | dbg("node %d\n", nid); |
| 982 | dbg("NODE_DATA() = %p\n", NODE_DATA(nid)); |
| 983 | |
| 984 | NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; |
| 985 | NODE_DATA(nid)->node_start_pfn = start_pfn; |
| 986 | NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn; |
| 987 | |
| 988 | if (NODE_DATA(nid)->node_spanned_pages == 0) |
| 989 | continue; |
| 990 | |
| 991 | dbg("start_paddr = %lx\n", start_pfn << PAGE_SHIFT); |
| 992 | dbg("end_paddr = %lx\n", end_pfn << PAGE_SHIFT); |
| 993 | |
| 994 | bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn); |
| 995 | bootmem_paddr = (unsigned long)careful_allocation(nid, |
| 996 | bootmap_pages << PAGE_SHIFT, |
| 997 | PAGE_SIZE, end_pfn); |
| 998 | memset(__va(bootmem_paddr), 0, bootmap_pages << PAGE_SHIFT); |
| 999 | |
| 1000 | dbg("bootmap_paddr = %lx\n", bootmem_paddr); |
| 1001 | |
| 1002 | init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT, |
| 1003 | start_pfn, end_pfn); |
| 1004 | |
| 1005 | free_bootmem_with_active_regions(nid, end_pfn); |
| 1006 | /* |
| 1007 | * Be very careful about moving this around. Future |
| 1008 | * calls to careful_allocation() depend on this getting |
| 1009 | * done correctly. |
| 1010 | */ |
| 1011 | mark_reserved_regions_for_nid(nid); |
Jon Tollefson | 8f64e1f | 2008-10-09 10:18:40 +0000 | [diff] [blame] | 1012 | sparse_memory_present_with_active_regions(nid); |
Dave Hansen | 4a61866 | 2008-11-24 12:02:35 +0000 | [diff] [blame] | 1013 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 1014 | } |
| 1015 | |
| 1016 | void __init paging_init(void) |
| 1017 | { |
Mel Gorman | 6391af1 | 2006-10-11 01:20:39 -0700 | [diff] [blame] | 1018 | unsigned long max_zone_pfns[MAX_NR_ZONES]; |
| 1019 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); |
| 1020 | max_zone_pfns[ZONE_DMA] = lmb_end_of_DRAM() >> PAGE_SHIFT; |
Mel Gorman | c67c3cb | 2006-09-27 01:49:49 -0700 | [diff] [blame] | 1021 | free_area_init_nodes(max_zone_pfns); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 1022 | } |
| 1023 | |
| 1024 | static int __init early_numa(char *p) |
| 1025 | { |
| 1026 | if (!p) |
| 1027 | return 0; |
| 1028 | |
| 1029 | if (strstr(p, "off")) |
| 1030 | numa_enabled = 0; |
| 1031 | |
| 1032 | if (strstr(p, "debug")) |
| 1033 | numa_debug = 1; |
| 1034 | |
Balbir Singh | 1daa6d0 | 2008-02-01 15:57:31 +1100 | [diff] [blame] | 1035 | p = strstr(p, "fake="); |
| 1036 | if (p) |
| 1037 | cmdline = p + strlen("fake="); |
| 1038 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 1039 | return 0; |
| 1040 | } |
| 1041 | early_param("numa", early_numa); |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1042 | |
| 1043 | #ifdef CONFIG_MEMORY_HOTPLUG |
| 1044 | /* |
Nathan Fontenot | 0db9360 | 2008-07-03 13:25:08 +1000 | [diff] [blame] | 1045 | * Validate the node associated with the memory section we are |
| 1046 | * trying to add. |
| 1047 | */ |
| 1048 | int valid_hot_add_scn(int *nid, unsigned long start, u32 lmb_size, |
| 1049 | unsigned long scn_addr) |
| 1050 | { |
| 1051 | nodemask_t nodes; |
| 1052 | |
| 1053 | if (*nid < 0 || !node_online(*nid)) |
| 1054 | *nid = any_online_node(NODE_MASK_ALL); |
| 1055 | |
| 1056 | if ((scn_addr >= start) && (scn_addr < (start + lmb_size))) { |
| 1057 | nodes_setall(nodes); |
| 1058 | while (NODE_DATA(*nid)->node_spanned_pages == 0) { |
| 1059 | node_clear(*nid, nodes); |
| 1060 | *nid = any_online_node(nodes); |
| 1061 | } |
| 1062 | |
| 1063 | return 1; |
| 1064 | } |
| 1065 | |
| 1066 | return 0; |
| 1067 | } |
| 1068 | |
| 1069 | /* |
| 1070 | * Find the node associated with a hot added memory section represented |
| 1071 | * by the ibm,dynamic-reconfiguration-memory node. |
| 1072 | */ |
| 1073 | static int hot_add_drconf_scn_to_nid(struct device_node *memory, |
| 1074 | unsigned long scn_addr) |
| 1075 | { |
| 1076 | const u32 *dm; |
| 1077 | unsigned int n, rc; |
| 1078 | unsigned long lmb_size; |
| 1079 | int default_nid = any_online_node(NODE_MASK_ALL); |
| 1080 | int nid; |
| 1081 | struct assoc_arrays aa; |
| 1082 | |
| 1083 | n = of_get_drconf_memory(memory, &dm); |
| 1084 | if (!n) |
| 1085 | return default_nid;; |
| 1086 | |
| 1087 | lmb_size = of_get_lmb_size(memory); |
| 1088 | if (!lmb_size) |
| 1089 | return default_nid; |
| 1090 | |
| 1091 | rc = of_get_assoc_arrays(memory, &aa); |
| 1092 | if (rc) |
| 1093 | return default_nid; |
| 1094 | |
| 1095 | for (; n != 0; --n) { |
| 1096 | struct of_drconf_cell drmem; |
| 1097 | |
| 1098 | read_drconf_cell(&drmem, &dm); |
| 1099 | |
| 1100 | /* skip this block if it is reserved or not assigned to |
| 1101 | * this partition */ |
| 1102 | if ((drmem.flags & DRCONF_MEM_RESERVED) |
| 1103 | || !(drmem.flags & DRCONF_MEM_ASSIGNED)) |
| 1104 | continue; |
| 1105 | |
| 1106 | nid = of_drconf_to_nid_single(&drmem, &aa); |
| 1107 | |
| 1108 | if (valid_hot_add_scn(&nid, drmem.base_addr, lmb_size, |
| 1109 | scn_addr)) |
| 1110 | return nid; |
| 1111 | } |
| 1112 | |
| 1113 | BUG(); /* section address should be found above */ |
| 1114 | return 0; |
| 1115 | } |
| 1116 | |
| 1117 | /* |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1118 | * Find the node associated with a hot added memory section. Section |
| 1119 | * corresponds to a SPARSEMEM section, not an LMB. It is assumed that |
| 1120 | * sections are fully contained within a single LMB. |
| 1121 | */ |
| 1122 | int hot_add_scn_to_nid(unsigned long scn_addr) |
| 1123 | { |
| 1124 | struct device_node *memory = NULL; |
Andrew Morton | 069007a | 2006-03-24 02:34:46 -0800 | [diff] [blame] | 1125 | int nid; |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1126 | |
| 1127 | if (!numa_enabled || (min_common_depth < 0)) |
Nathan Fontenot | 0db9360 | 2008-07-03 13:25:08 +1000 | [diff] [blame] | 1128 | return any_online_node(NODE_MASK_ALL); |
| 1129 | |
| 1130 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); |
| 1131 | if (memory) { |
| 1132 | nid = hot_add_drconf_scn_to_nid(memory, scn_addr); |
| 1133 | of_node_put(memory); |
| 1134 | return nid; |
| 1135 | } |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1136 | |
| 1137 | while ((memory = of_find_node_by_type(memory, "memory")) != NULL) { |
| 1138 | unsigned long start, size; |
Mike Kravetz | b226e46 | 2005-12-16 14:30:35 -0800 | [diff] [blame] | 1139 | int ranges; |
Jeremy Kerr | a7f67bd | 2006-07-12 15:35:54 +1000 | [diff] [blame] | 1140 | const unsigned int *memcell_buf; |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1141 | unsigned int len; |
| 1142 | |
Stephen Rothwell | e2eb639 | 2007-04-03 22:26:41 +1000 | [diff] [blame] | 1143 | memcell_buf = of_get_property(memory, "reg", &len); |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1144 | if (!memcell_buf || len <= 0) |
| 1145 | continue; |
| 1146 | |
Benjamin Herrenschmidt | cc5d018 | 2005-12-13 18:01:21 +1100 | [diff] [blame] | 1147 | /* ranges in cell */ |
| 1148 | ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells); |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1149 | ha_new_range: |
| 1150 | start = read_n_cells(n_mem_addr_cells, &memcell_buf); |
| 1151 | size = read_n_cells(n_mem_size_cells, &memcell_buf); |
Jeremy Kerr | 953039c | 2006-05-01 12:16:12 -0700 | [diff] [blame] | 1152 | nid = of_node_to_nid_single(memory); |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1153 | |
Nathan Fontenot | 0db9360 | 2008-07-03 13:25:08 +1000 | [diff] [blame] | 1154 | if (valid_hot_add_scn(&nid, start, size, scn_addr)) { |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1155 | of_node_put(memory); |
Nathan Fontenot | 0db9360 | 2008-07-03 13:25:08 +1000 | [diff] [blame] | 1156 | return nid; |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1157 | } |
| 1158 | |
| 1159 | if (--ranges) /* process all ranges in cell */ |
| 1160 | goto ha_new_range; |
| 1161 | } |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1162 | BUG(); /* section address should be found above */ |
Andrew Morton | 069007a | 2006-03-24 02:34:46 -0800 | [diff] [blame] | 1163 | return 0; |
Mike Kravetz | 237a098 | 2005-12-05 12:06:42 -0800 | [diff] [blame] | 1164 | } |
| 1165 | #endif /* CONFIG_MEMORY_HOTPLUG */ |