diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2006-08-14 14:53:10 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2006-10-06 12:44:15 +0900 |
| commit | 9e741cbe256fa166d1e18b635cd55ae173eb0224 (patch) | |
| tree | cc9ad392310c07d4177efa700d210be2fb4c9ba5 | |
| parent | 0d5e71fbcb114b5a67ef7277dbad206915a20df2 (diff) | |
ia64: kdump: reserve efi memmap and boot param region
This patch is against kexec-tools-1.101 with kdump10 patch.
This patch reserve efi memmap and boot param area for the first kernel
so that they will not be overlapped.
Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
Removed trailing whitespace
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/ia64/kexec-ia64.c | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/kexec/arch/ia64/kexec-ia64.c b/kexec/arch/ia64/kexec-ia64.c index c11d36c..48fad60 100644 --- a/kexec/arch/ia64/kexec-ia64.c +++ b/kexec/arch/ia64/kexec-ia64.c @@ -36,6 +36,38 @@ static struct memory_range memory_range[MAX_MEMORY_RANGES]; +/* Reserve range for EFI memmap and Boot parameter */ +static int split_range(int range, unsigned long start, unsigned long end) +{ + unsigned long ram_end = memory_range[range - 1].end; + unsigned int type = memory_range[range - 1].type; + int i; + //align end and start to page size of EFI + start = start & ~((1UL<<12) - 1); + end = (end + (1UL<<12) - 1)& ~((1UL<<12) - 1); + for (i = 0; i < range; i++) + if(memory_range[i].start <= start && memory_range[i].end >=end) + break; + if (i >= range) + return range; + range = i; + if (memory_range[range].start < start) { + memory_range[range].end = start; + range++; + } + memory_range[range].start = start; + memory_range[range].end = end; + memory_range[range].type = RANGE_RESERVED; + range++; + if (end < ram_end) { + memory_range[range].start = end; + memory_range[range].end = ram_end; + memory_range[range].type = type; + range++; + } + return range; +} + /* Return a sorted list of available memory ranges. */ int get_memory_ranges(struct memory_range **range, int *ranges, unsigned long kexec_flags) @@ -85,6 +117,12 @@ int get_memory_ranges(struct memory_range **range, int *ranges, mem_max = end; } continue; + } else if (memcmp(str, "Boot parameter\n", 14) == 0) { + memory_ranges = split_range(memory_ranges, start, end); + continue; + } else if (memcmp(str, "EFI Memory Map\n", 14) == 0) { + memory_ranges = split_range(memory_ranges, start, end); + continue; } else continue; /* @@ -125,7 +163,7 @@ int arch_process_options(int argc, char **argv) { static const struct option options[] = { KEXEC_ARCH_OPTIONS - { 0, 0, NULL, 0 }, + { 0, 0, NULL, 0 }, }; static const char short_options[] = KEXEC_ARCH_OPT_STR; int opt; |