Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c3391f9 authored by Bernhard Walle's avatar Bernhard Walle Committed by Linus Torvalds
Browse files

Use extended crashkernel command line on x86_64 



This patch removes the crashkernel parsing from
arch/x86_64/kernel/machine_kexec.c and calls the generic function, introduced
in the last patch, in setup_bootmem_allocator().

This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.

Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d62cc471

arch/x86/kernel/e820_64.c

+2 −1
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ void __init e820_reserve_resources(void) 
			request_resource(res, &code_resource);

			request_resource(res, &data_resource);

#ifdef CONFIG_KEXEC

			if (crashk_res.start != crashk_res.end)

				request_resource(res, &crashk_res);

#endif

		}

arch/x86/kernel/machine_kexec_64.c

+0 −27
Original line number Diff line number Diff line
@@ -231,33 +231,6 @@ NORET_TYPE void machine_kexec(struct kimage *image) 
			image->start);

}



/* crashkernel=size@addr specifies the location to reserve for

 * a crash kernel.  By reserving this memory we guarantee

 * that linux never set's it up as a DMA target.

 * Useful for holding code to do something appropriate

 * after a kernel panic.

 */

static int __init setup_crashkernel(char *arg)

{

	unsigned long size, base;

	char *p;

	if (!arg)

		return -EINVAL;

	size = memparse(arg, &p);

	if (arg == p)

		return -EINVAL;

	if (*p == '@') {

		base = memparse(p+1, &p);

		/* FIXME: Do I want a sanity check to validate the

		 * memory range?  Yes you do, but it's too early for

		 * e820 -AK */

		crashk_res.start = base;

		crashk_res.end   = base + size - 1;

	}

	return 0;

}

early_param("crashkernel", setup_crashkernel);



void arch_crash_save_vmcoreinfo(void)

{

#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE

arch/x86/kernel/setup_64.c

+32 −7
Original line number Diff line number Diff line
@@ -191,6 +191,37 @@ static inline void copy_edd(void) 
}

#endif



#ifdef CONFIG_KEXEC

static void __init reserve_crashkernel(void)

{

	unsigned long long free_mem;

	unsigned long long crash_size, crash_base;

	int ret;



	free_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;



	ret = parse_crashkernel(boot_command_line, free_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size) {

		if (crash_base > 0) {

			printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

					"for crashkernel (System RAM: %ldMB)\n",

					(unsigned long)(crash_size >> 20),

					(unsigned long)(crash_base >> 20),

					(unsigned long)(free_mem >> 20));

			crashk_res.start = crash_base;

			crashk_res.end   = crash_base + crash_size - 1;

			reserve_bootmem(crash_base, crash_size);

		} else

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");

	}

}

#else

static inline void __init reserve_crashkernel(void)

{}

#endif



#define EBDA_ADDR_POINTER 0x40E



unsigned __initdata ebda_addr;
@@ -357,13 +388,7 @@ void __init setup_arch(char **cmdline_p) 
		}

	}

#endif

#ifdef CONFIG_KEXEC

	if (crashk_res.start != crashk_res.end) {

		reserve_bootmem_generic(crashk_res.start,

			crashk_res.end - crashk_res.start + 1);

	}

#endif



	reserve_crashkernel();

	paging_init();



#ifdef CONFIG_PCI