diff options
-rw-r--r-- | arch/ia64/kernel/efi.c | 4 | ||||
-rw-r--r-- | arch/ia64/kernel/setup.c | 88 | ||||
-rw-r--r-- | include/asm-ia64/meminit.h | 2 |
3 files changed, 50 insertions, 44 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 73ca86d03810..8e4894b205e2 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
@@ -967,7 +967,7 @@ find_memmap_space (void) | |||
967 | * to use. We can allocate partial granules only if the unavailable | 967 | * to use. We can allocate partial granules only if the unavailable |
968 | * parts exist, and are WB. | 968 | * parts exist, and are WB. |
969 | */ | 969 | */ |
970 | void | 970 | unsigned long |
971 | efi_memmap_init(unsigned long *s, unsigned long *e) | 971 | efi_memmap_init(unsigned long *s, unsigned long *e) |
972 | { | 972 | { |
973 | struct kern_memdesc *k, *prev = NULL; | 973 | struct kern_memdesc *k, *prev = NULL; |
@@ -1084,6 +1084,8 @@ efi_memmap_init(unsigned long *s, unsigned long *e) | |||
1084 | /* reserve the memory we are using for kern_memmap */ | 1084 | /* reserve the memory we are using for kern_memmap */ |
1085 | *s = (u64)kern_memmap; | 1085 | *s = (u64)kern_memmap; |
1086 | *e = (u64)++k; | 1086 | *e = (u64)++k; |
1087 | |||
1088 | return total_mem; | ||
1087 | } | 1089 | } |
1088 | 1090 | ||
1089 | void | 1091 | void |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index c5cfcfa4c87c..cbf67f1aa291 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -208,6 +208,48 @@ static int __init register_memory(void) | |||
208 | 208 | ||
209 | __initcall(register_memory); | 209 | __initcall(register_memory); |
210 | 210 | ||
211 | |||
212 | #ifdef CONFIG_KEXEC | ||
213 | static void __init setup_crashkernel(unsigned long total, int *n) | ||
214 | { | ||
215 | unsigned long long base = 0, size = 0; | ||
216 | int ret; | ||
217 | |||
218 | ret = parse_crashkernel(boot_command_line, total, | ||
219 | &size, &base); | ||
220 | if (ret == 0 && size > 0) { | ||
221 | if (!base) { | ||
222 | sort_regions(rsvd_region, *n); | ||
223 | base = kdump_find_rsvd_region(size, | ||
224 | rsvd_region, *n); | ||
225 | } | ||
226 | if (base != ~0UL) { | ||
227 | printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " | ||
228 | "for crashkernel (System RAM: %ldMB)\n", | ||
229 | (unsigned long)(size >> 20), | ||
230 | (unsigned long)(base >> 20), | ||
231 | (unsigned long)(total >> 20)); | ||
232 | rsvd_region[*n].start = | ||
233 | (unsigned long)__va(base); | ||
234 | rsvd_region[*n].end = | ||
235 | (unsigned long)__va(base + size); | ||
236 | (*n)++; | ||
237 | crashk_res.start = base; | ||
238 | crashk_res.end = base + size - 1; | ||
239 | } | ||
240 | } | ||
241 | efi_memmap_res.start = ia64_boot_param->efi_memmap; | ||
242 | efi_memmap_res.end = efi_memmap_res.start + | ||
243 | ia64_boot_param->efi_memmap_size; | ||
244 | boot_param_res.start = __pa(ia64_boot_param); | ||
245 | boot_param_res.end = boot_param_res.start + | ||
246 | sizeof(*ia64_boot_param); | ||
247 | } | ||
248 | #else | ||
249 | static inline void __init setup_crashkernel(unsigned long total, int *n) | ||
250 | {} | ||
251 | #endif | ||
252 | |||
211 | /** | 253 | /** |
212 | * reserve_memory - setup reserved memory areas | 254 | * reserve_memory - setup reserved memory areas |
213 | * | 255 | * |
@@ -219,6 +261,7 @@ void __init | |||
219 | reserve_memory (void) | 261 | reserve_memory (void) |
220 | { | 262 | { |
221 | int n = 0; | 263 | int n = 0; |
264 | unsigned long total_memory; | ||
222 | 265 | ||
223 | /* | 266 | /* |
224 | * none of the entries in this table overlap | 267 | * none of the entries in this table overlap |
@@ -254,50 +297,11 @@ reserve_memory (void) | |||
254 | n++; | 297 | n++; |
255 | #endif | 298 | #endif |
256 | 299 | ||
257 | efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end); | 300 | total_memory = efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end); |
258 | n++; | 301 | n++; |
259 | 302 | ||
260 | #ifdef CONFIG_KEXEC | 303 | setup_crashkernel(total_memory, &n); |
261 | /* crashkernel=size@offset specifies the size to reserve for a crash | 304 | |
262 | * kernel. If offset is 0, then it is determined automatically. | ||
263 | * By reserving this memory we guarantee that linux never set's it | ||
264 | * up as a DMA target.Useful for holding code to do something | ||
265 | * appropriate after a kernel panic. | ||
266 | */ | ||
267 | { | ||
268 | char *from = strstr(boot_command_line, "crashkernel="); | ||
269 | unsigned long base, size; | ||
270 | if (from) { | ||
271 | size = memparse(from + 12, &from); | ||
272 | if (*from == '@') | ||
273 | base = memparse(from+1, &from); | ||
274 | else | ||
275 | base = 0; | ||
276 | if (size) { | ||
277 | if (!base) { | ||
278 | sort_regions(rsvd_region, n); | ||
279 | base = kdump_find_rsvd_region(size, | ||
280 | rsvd_region, n); | ||
281 | } | ||
282 | if (base != ~0UL) { | ||
283 | rsvd_region[n].start = | ||
284 | (unsigned long)__va(base); | ||
285 | rsvd_region[n].end = | ||
286 | (unsigned long)__va(base + size); | ||
287 | n++; | ||
288 | crashk_res.start = base; | ||
289 | crashk_res.end = base + size - 1; | ||
290 | } | ||
291 | } | ||
292 | } | ||
293 | efi_memmap_res.start = ia64_boot_param->efi_memmap; | ||
294 | efi_memmap_res.end = efi_memmap_res.start + | ||
295 | ia64_boot_param->efi_memmap_size; | ||
296 | boot_param_res.start = __pa(ia64_boot_param); | ||
297 | boot_param_res.end = boot_param_res.start + | ||
298 | sizeof(*ia64_boot_param); | ||
299 | } | ||
300 | #endif | ||
301 | /* end of memory marker */ | 305 | /* end of memory marker */ |
302 | rsvd_region[n].start = ~0UL; | 306 | rsvd_region[n].start = ~0UL; |
303 | rsvd_region[n].end = ~0UL; | 307 | rsvd_region[n].end = ~0UL; |
diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h index 3a62878e84f3..f93308f54b61 100644 --- a/include/asm-ia64/meminit.h +++ b/include/asm-ia64/meminit.h | |||
@@ -35,7 +35,7 @@ extern void find_memory (void); | |||
35 | extern void reserve_memory (void); | 35 | extern void reserve_memory (void); |
36 | extern void find_initrd (void); | 36 | extern void find_initrd (void); |
37 | extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg); | 37 | extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg); |
38 | extern void efi_memmap_init(unsigned long *, unsigned long *); | 38 | extern unsigned long efi_memmap_init(unsigned long *s, unsigned long *e); |
39 | extern int find_max_min_low_pfn (unsigned long , unsigned long, void *); | 39 | extern int find_max_min_low_pfn (unsigned long , unsigned long, void *); |
40 | 40 | ||
41 | extern unsigned long vmcore_find_descriptor_size(unsigned long address); | 41 | extern unsigned long vmcore_find_descriptor_size(unsigned long address); |