Prev: usb: testing the wrong variable in fs_create_by_name()
Next: [PATCH 3/5] Support second memory region in crash_shrink_memory()
From: Vitaly Mayatskikh on 22 Apr 2010 12:30
This patch adds second memory region support for kexec on x86
platform.

Signed-off-by: Vitaly Mayatskikh <v.mayatskih(a)gmail.com>
---
arch/x86/kernel/setup.c | 56 +++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index c4851ef..9b395bb 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -501,19 +501,11 @@ static inline unsigned long long get_total_mem(void)
return total << PAGE_SHIFT;
}

-static void __init reserve_crashkernel(void)
+static int __init reserve_crashkernel_region(char *region_name,
+ struct resource *crashk,
+ unsigned long long crash_size,
+ unsigned long long crash_base)
{
- unsigned long long total_mem;
- unsigned long long crash_size, crash_base;
- int ret;
-
- total_mem = get_total_mem();
-
- ret = parse_crashkernel(boot_command_line, total_mem,
- &crash_size, &crash_base);
- if (ret != 0 || crash_size <= 0)
- return;
-
/* 0 means: find the address automatically */
if (crash_base <= 0) {
const unsigned long long alignment = 16<<20; /* 16M */
@@ -522,7 +514,7 @@ static void __init reserve_crashkernel(void)
alignment);
if (crash_base == -1ULL) {
pr_info("crashkernel reservation failed - No suitable area found.\n");
- return;
+ return -EINVAL;
}
} else {
unsigned long long start;
@@ -531,20 +523,42 @@ static void __init reserve_crashkernel(void)
1<<20);
if (start != crash_base) {
pr_info("crashkernel reservation failed - memory is in use.\n");
- return;
+ return -EINVAL;
}
}
- reserve_early(crash_base, crash_base + crash_size, "CRASH KERNEL");
+ reserve_early(crash_base, crash_base + crash_size, region_name);

printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
- "for crashkernel (System RAM: %ldMB)\n",
+ "for crashkernel\n",
(unsigned long)(crash_size >> 20),
- (unsigned long)(crash_base >> 20),
- (unsigned long)(total_mem >> 20));
+ (unsigned long)(crash_base >> 20));
+
+ crashk->start = crash_base;
+ crashk->end = crash_base + crash_size - 1;
+ insert_resource(&iomem_resource, crashk);
+ return 0;
+}
+
+static void __init reserve_crashkernel(void)
+{
+ unsigned long long total_mem;
+ unsigned long long crash_size, crash_base;
+ unsigned long long crash_size_hi, crash_base_hi;
+ int ret;
+
+ total_mem = get_total_mem();
+
+ ret = parse_crashkernel_ext(boot_command_line, total_mem,
+ &crash_size, &crash_base,
+ &crash_size_hi, &crash_base_hi);
+ if (ret != 0 || crash_size <= 0)
+ return;

- crashk_res.start = crash_base;
- crashk_res.end = crash_base + crash_size - 1;
- insert_resource(&iomem_resource, &crashk_res);
+ ret = reserve_crashkernel_region("CRASH KERNEL", &crashk_res,
+ crash_size, crash_base);
+ if (ret == 0 && crash_size_hi > 0)
+ reserve_crashkernel_region("CRASH HIMEM", &crashk_res_hi,
+ crash_size_hi, crash_base_hi);
}
#else
static void __init reserve_crashkernel(void)
--
1.7.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: usb: testing the wrong variable in fs_create_by_name()
Next: [PATCH 3/5] Support second memory region in crash_shrink_memory()