diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2008-04-30 00:47:12 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-30 05:49:48 -0400 |
commit | eabd90944b3a00766e84da3d117ea0f3e0a3b1a3 (patch) | |
tree | 63899a91d207c3b72ddae1984742e1438b4a7e9b | |
parent | 3243d87441bf7f97c5c9f7dd46b35f5783ec6740 (diff) |
[POWERPC] Fix crashkernel= handling when no crashkernel= specified
Commit edd8ce67436851a62f99f1d9707b40ea6a8e5323 (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>
-rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index 2d202f274e7..29a0e039d43 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c | |||
@@ -74,20 +74,20 @@ void __init reserve_crashkernel(void) | |||
74 | ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(), | 74 | ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(), |
75 | &crash_size, &crash_base); | 75 | &crash_size, &crash_base); |
76 | if (ret == 0 && crash_size > 0) { | 76 | if (ret == 0 && crash_size > 0) { |
77 | if (crash_base == 0) | ||
78 | crash_base = KDUMP_KERNELBASE; | ||
79 | crashk_res.start = crash_base; | 77 | crashk_res.start = crash_base; |
80 | } else { | 78 | crashk_res.end = crash_base + crash_size - 1; |
81 | /* handle the device tree */ | ||
82 | crash_size = crashk_res.end - crashk_res.start + 1; | ||
83 | } | 79 | } |
84 | 80 | ||
85 | if (crash_size == 0) | 81 | if (crashk_res.end == crashk_res.start) { |
82 | crashk_res.start = crashk_res.end = 0; | ||
86 | return; | 83 | return; |
84 | } | ||
87 | 85 | ||
88 | /* We might have got these values via the command line or the | 86 | /* We might have got these values via the command line or the |
89 | * device tree, either way sanitise them now. */ | 87 | * device tree, either way sanitise them now. */ |
90 | 88 | ||
89 | crash_size = crashk_res.end - crashk_res.start + 1; | ||
90 | |||
91 | if (crashk_res.start != KDUMP_KERNELBASE) | 91 | if (crashk_res.start != KDUMP_KERNELBASE) |
92 | printk("Crash kernel location must be 0x%x\n", | 92 | printk("Crash kernel location must be 0x%x\n", |
93 | KDUMP_KERNELBASE); | 93 | KDUMP_KERNELBASE); |