You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
76 lines
2.5 KiB
76 lines
2.5 KiB
From 7a4381e2042e2be308c96bc927145bc39a0594cc Mon Sep 17 00:00:00 2001 |
|
Message-Id: <7a4381e2042e2be308c96bc927145bc39a0594cc.1489676829.git.panand@redhat.com> |
|
In-Reply-To: <f85183096d31d865c97565614535d84943b12908.1489676829.git.panand@redhat.com> |
|
References: <f85183096d31d865c97565614535d84943b12908.1489676829.git.panand@redhat.com> |
|
From: AKASHI Takahiro <takahiro.akashi@linaro.org> |
|
Date: Wed, 15 Mar 2017 18:38:18 +0900 |
|
Subject: [PATCH 04/10] 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> |
|
--- |
|
kexec/arch/arm64/iomem.h | 7 +++++++ |
|
kexec/arch/arm64/kexec-arm64.c | 12 ++++++++++-- |
|
2 files changed, 17 insertions(+), 2 deletions(-) |
|
create mode 100644 kexec/arch/arm64/iomem.h |
|
|
|
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 04fd3968bb52..d02b9dac3d33 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" |
|
|
|
@@ -476,7 +477,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; |
|
|
|
@@ -495,7 +503,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.9.3 |
|
|
|
|