From ef26cc33b8d66460c555600b0e388f55c5cd6f21 Mon Sep 17 00:00:00 2001 From: AKASHI Takahiro Date: Wed, 17 May 2017 14:51:43 +0900 Subject: [PATCH 37/45] arm64: identify PHYS_OFFSET correctly Due to the kernel patch, commit e7cd190385d1 ("arm64: mark reserved memblock regions explicitly in iomem"), the current code will not be able to identify the correct value of PHYS_OFFSET if some "reserved" memory region, which is likely to be UEFI runtime services code/data, exists at an address below the first "System RAM" regions. This patch fixes this issue. Signed-off-by: AKASHI Takahiro Tested-by: David Woodhouse Tested-by: Pratyush Anand Signed-off-by: Simon Horman --- kexec/arch/arm64/Makefile | 1 + kexec/arch/arm64/iomem.h | 7 +++++++ kexec/arch/arm64/kexec-arm64.c | 12 ++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 kexec/arch/arm64/iomem.h diff --git a/kexec/arch/arm64/Makefile b/kexec/arch/arm64/Makefile index a931f0e94012..91f6388e46a3 100644 --- a/kexec/arch/arm64/Makefile +++ b/kexec/arch/arm64/Makefile @@ -26,6 +26,7 @@ dist += $(arm64_KEXEC_SRCS) \ kexec/arch/arm64/include/arch/options.h \ kexec/arch/arm64/crashdump-arm64.h \ kexec/arch/arm64/image-header.h \ + kexec/arch/arm64/iomem.h \ kexec/arch/arm64/kexec-arm64.h \ kexec/arch/arm64/Makefile diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h new file mode 100644 index 000000000000..7fd66eb063e1 --- /dev/null +++ b/kexec/arch/arm64/iomem.h @@ -0,0 +1,7 @@ +#ifndef IOMEM_H +#define IOMEM_H + +#define SYSTEM_RAM "System RAM\n" +#define IOMEM_RESERVED "reserved\n" + +#endif diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c index c82293973936..7024f749f3f6 100644 --- a/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c @@ -21,6 +21,7 @@ #include "crashdump-arm64.h" #include "dt-ops.h" #include "fs2dt.h" +#include "iomem.h" #include "kexec-syscall.h" #include "arch/options.h" @@ -477,7 +478,14 @@ static int get_memory_ranges_iomem_cb(void *data, int nr, char *str, return -1; r = (struct memory_range *)data + nr; - r->type = RANGE_RAM; + + if (!strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM))) + r->type = RANGE_RAM; + else if (!strncmp(str, IOMEM_RESERVED, strlen(IOMEM_RESERVED))) + r->type = RANGE_RESERVED; + else + return 1; + r->start = base; r->end = base + length - 1; @@ -496,7 +504,7 @@ static int get_memory_ranges_iomem_cb(void *data, int nr, char *str, static int get_memory_ranges_iomem(struct memory_range *array, unsigned int *count) { - *count = kexec_iomem_for_each_line("System RAM\n", + *count = kexec_iomem_for_each_line(NULL, get_memory_ranges_iomem_cb, array); if (!*count) { -- 2.13.0