arm: crashdump needs boot alias of crash kernel region

When crashdumping, we need the boot memory alias of the crash kernel
region rather than the system view.  Arrange to check for the boot
alias of the crash kernel region first, and if found, use it instead
of the main alias.

Reviewed-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Russell King
2016-06-06 18:00:52 +01:00
committed by Simon Horman
parent 92e120d8ca
commit e401f47321

View File

@@ -20,6 +20,7 @@
#include "kexec-arm.h"
#include "../../fs2dt.h"
#include "crashdump-arm.h"
#include "iomem.h"
#define BOOT_PARAMS_SIZE 1536
@@ -499,7 +500,8 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
* We put the dump capture kernel at the start of crashkernel
* reserved memory.
*/
if (parse_iomem_single("Crash kernel\n", &start, &end)) {
if (parse_iomem_single(CRASH_KERNEL_BOOT, &start, &end) &&
parse_iomem_single(CRASH_KERNEL, &start, &end)) {
/*
* No crash kernel memory reserved. We cannot do more
* but just bail out.