diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2017-05-17 14:51:43 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2017-05-22 13:34:12 +0200 |
| commit | ef26cc33b8d66460c555600b0e388f55c5cd6f21 (patch) | |
| tree | 51518bf4e09273466273b3fcd441c7997a553812 | |
| parent | 325804055e99dbf40af5e6fa546320b821d9d821 (diff) | |
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 <takahiro.akashi@linaro.org>
Tested-by: David Woodhouse <dwmw@amazon.co.uk>
Tested-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/arm64/Makefile | 1 | ||||
| -rw-r--r-- | kexec/arch/arm64/iomem.h | 7 | ||||
| -rw-r--r-- | kexec/arch/arm64/kexec-arm64.c | 12 |
3 files changed, 18 insertions, 2 deletions
diff --git a/kexec/arch/arm64/Makefile b/kexec/arch/arm64/Makefile index a931f0e..91f6388 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 0000000..7fd66eb --- /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 c822939..7024f74 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) { |