diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2013-02-21 20:07:56 -0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-03-05 10:36:22 +0900 |
| commit | 53bb3029557936ed12960e7cc2619a20ee7d382b (patch) | |
| tree | 9923f51e2502746c7b4423df4259587ad1a91197 | |
| parent | 82c3dd2280d2b75493b31d5d07a40226337a822e (diff) | |
kexec, x86: handle Crash low kernel range
kernel could have that in /proc/iomem, will use it for kdump kernel
for dma32
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/crashdump-x86.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index 245402c..83bff5e 100644 --- a/kexec/arch/i386/crashdump-x86.c +++ b/kexec/arch/i386/crashdump-x86.c @@ -188,6 +188,8 @@ static struct memory_range crash_memory_range[CRASH_MAX_MEMORY_RANGES]; /* Memory region reserved for storing panic kernel and other data. */ static struct memory_range crash_reserved_mem; +/* under 4G parts */ +static struct memory_range crash_reserved_low_mem; /* Reads the appropriate file and retrieves the SYSTEM RAM regions for whom to * create Elf headers. Keeping it separate from get_memory_ranges() as @@ -282,6 +284,10 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges, if (exclude_region(&memory_ranges, crash_reserved_mem.start, crash_reserved_mem.end) < 0) return -1; + if (crash_reserved_low_mem.start && + exclude_region(&memory_ranges, crash_reserved_low_mem.start, + crash_reserved_low_mem.end) < 0) + return -1; if (gart) { /* exclude GART region if the system has one */ if (exclude_region(&memory_ranges, gart_start, gart_end) < 0) @@ -984,6 +990,12 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline, return ENOCRASHKERNEL; } + if (crash_reserved_low_mem.start) { + sz = crash_reserved_low_mem.end - crash_reserved_low_mem.start + +1; + add_memmap(memmap_p, crash_reserved_low_mem.start, sz); + } + /* Create a backup region segment to store backup data*/ if (!(info->kexec_flags & KEXEC_PRESERVE_CONTEXT)) { sz = (info->backup_src_size + align) & ~(align - 1); @@ -1059,5 +1071,14 @@ int is_crashkernel_mem_reserved(void) crash_reserved_mem.end = end; crash_reserved_mem.type = RANGE_RAM; + /* If there is no Crash low kernel, still can go on */ + if (parse_iomem_single("Crash kernel low\n", &start, &end) || + start == end) + return 1; + + crash_reserved_low_mem.start = start; + crash_reserved_low_mem.end = end; + crash_reserved_low_mem.type = RANGE_RAM; + return 1; } |