mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 07:33:56 +00:00
eabd90944b
Commit edd8ce6743 (Use extended crashkernel
command line on ppc64), changed the logic in reserve_crashkernel()
which deals with the crashkernel= command line option.
This introduced a bug in the case when there is no crashkernel= option,
or it is incorrect. We would fall through and calculate the crash_size
based on the existing values in crashk_res. If both start and end are 0,
the default, we calculate the crash_size as 1 byte - which is wrong.
Rework the logic so that we use crashk_res, regardless of whether it's
set by the command line or via the device tree (see prom.c). Then check
if we have an empty range (end == start), and if so make sure to set
both end and start to zero (this is checked in machine_kexec_64.c). Then
we calculate the crash_size once we know we have a non-zero range.
Finally we always want to warn the user if they specify a base != 32MB,
so remove the special case for that in the command line parsing case.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
119 lines
3.1 KiB
C
119 lines
3.1 KiB
C
/*
|
|
* Code to handle transition of Linux booting another kernel.
|
|
*
|
|
* Copyright (C) 2002-2003 Eric Biederman <ebiederm@xmission.com>
|
|
* GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
|
|
* Copyright (C) 2005 IBM Corporation.
|
|
*
|
|
* This source code is licensed under the GNU General Public License,
|
|
* Version 2. See the file COPYING for more details.
|
|
*/
|
|
|
|
#include <linux/kexec.h>
|
|
#include <linux/reboot.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/lmb.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/prom.h>
|
|
|
|
void machine_crash_shutdown(struct pt_regs *regs)
|
|
{
|
|
if (ppc_md.machine_crash_shutdown)
|
|
ppc_md.machine_crash_shutdown(regs);
|
|
}
|
|
|
|
/*
|
|
* Do what every setup is needed on image and the
|
|
* reboot code buffer to allow us to avoid allocations
|
|
* later.
|
|
*/
|
|
int machine_kexec_prepare(struct kimage *image)
|
|
{
|
|
if (ppc_md.machine_kexec_prepare)
|
|
return ppc_md.machine_kexec_prepare(image);
|
|
/*
|
|
* Fail if platform doesn't provide its own machine_kexec_prepare
|
|
* implementation.
|
|
*/
|
|
return -ENOSYS;
|
|
}
|
|
|
|
void machine_kexec_cleanup(struct kimage *image)
|
|
{
|
|
if (ppc_md.machine_kexec_cleanup)
|
|
ppc_md.machine_kexec_cleanup(image);
|
|
}
|
|
|
|
/*
|
|
* Do not allocate memory (or fail in any way) in machine_kexec().
|
|
* We are past the point of no return, committed to rebooting now.
|
|
*/
|
|
NORET_TYPE void machine_kexec(struct kimage *image)
|
|
{
|
|
if (ppc_md.machine_kexec)
|
|
ppc_md.machine_kexec(image);
|
|
else {
|
|
/*
|
|
* Fall back to normal restart if platform doesn't provide
|
|
* its own kexec function, and user insist to kexec...
|
|
*/
|
|
machine_restart(NULL);
|
|
}
|
|
for(;;);
|
|
}
|
|
|
|
void __init reserve_crashkernel(void)
|
|
{
|
|
unsigned long long crash_size, crash_base;
|
|
int ret;
|
|
|
|
/* this is necessary because of lmb_phys_mem_size() */
|
|
lmb_analyze();
|
|
|
|
/* use common parsing */
|
|
ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(),
|
|
&crash_size, &crash_base);
|
|
if (ret == 0 && crash_size > 0) {
|
|
crashk_res.start = crash_base;
|
|
crashk_res.end = crash_base + crash_size - 1;
|
|
}
|
|
|
|
if (crashk_res.end == crashk_res.start) {
|
|
crashk_res.start = crashk_res.end = 0;
|
|
return;
|
|
}
|
|
|
|
/* We might have got these values via the command line or the
|
|
* device tree, either way sanitise them now. */
|
|
|
|
crash_size = crashk_res.end - crashk_res.start + 1;
|
|
|
|
if (crashk_res.start != KDUMP_KERNELBASE)
|
|
printk("Crash kernel location must be 0x%x\n",
|
|
KDUMP_KERNELBASE);
|
|
|
|
crashk_res.start = KDUMP_KERNELBASE;
|
|
crash_size = PAGE_ALIGN(crash_size);
|
|
crashk_res.end = crashk_res.start + crash_size - 1;
|
|
|
|
/* Crash kernel trumps memory limit */
|
|
if (memory_limit && memory_limit <= crashk_res.end) {
|
|
memory_limit = crashk_res.end + 1;
|
|
printk("Adjusted memory limit for crashkernel, now 0x%lx\n",
|
|
memory_limit);
|
|
}
|
|
|
|
printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
|
|
"for crashkernel (System RAM: %ldMB)\n",
|
|
(unsigned long)(crash_size >> 20),
|
|
(unsigned long)(crashk_res.start >> 20),
|
|
(unsigned long)(lmb_phys_mem_size() >> 20));
|
|
|
|
lmb_reserve(crashk_res.start, crash_size);
|
|
}
|
|
|
|
int overlaps_crashkernel(unsigned long start, unsigned long size)
|
|
{
|
|
return (start + size) > crashk_res.start && start <= crashk_res.end;
|
|
}
|