|
 |
de80c6 |
From 04a2b7bb55bfee0495cc39796846adf8d6a313bc Mon Sep 17 00:00:00 2001
|
|
|
de80c6 |
Message-Id: <04a2b7bb55bfee0495cc39796846adf8d6a313bc.1430751022.git.panand@redhat.com>
|
|
|
de80c6 |
In-Reply-To: <8b40614f4c1925fe94f274dfc69d1a63537fe399.1430751022.git.panand@redhat.com>
|
|
|
de80c6 |
References: <8b40614f4c1925fe94f274dfc69d1a63537fe399.1430751022.git.panand@redhat.com>
|
|
|
de80c6 |
From: Pratyush Anand <panand@redhat.com>
|
|
|
de80c6 |
Date: Mon, 4 May 2015 17:47:14 +0530
|
|
|
de80c6 |
Subject: [PATCH 2/3] arm64: Pass RAM boundary to purgatory
|
|
|
de80c6 |
|
|
|
de80c6 |
RAM boundary which includes all the sections is needed for creating
|
|
|
de80c6 |
identity page mapping and to enable d-cache for those areas.
|
|
|
de80c6 |
|
|
|
de80c6 |
Signed-off-by: Pratyush Anand <panand@redhat.com>
|
|
|
de80c6 |
---
|
|
|
de80c6 |
kexec/arch/arm64/include/types.h | 16 ++++++++++++++++
|
|
|
de80c6 |
kexec/arch/arm64/kexec-arm64.c | 16 +++++++++++++++-
|
|
|
de80c6 |
purgatory/arch/arm64/entry.S | 10 ++++++++++
|
|
|
de80c6 |
3 files changed, 41 insertions(+), 1 deletion(-)
|
|
|
de80c6 |
create mode 100644 kexec/arch/arm64/include/types.h
|
|
|
de80c6 |
|
|
|
de80c6 |
diff --git a/kexec/arch/arm64/include/types.h b/kexec/arch/arm64/include/types.h
|
|
|
de80c6 |
new file mode 100644
|
|
|
de80c6 |
index 000000000000..08f833a6d585
|
|
|
de80c6 |
--- /dev/null
|
|
|
de80c6 |
+++ b/kexec/arch/arm64/include/types.h
|
|
|
de80c6 |
@@ -0,0 +1,16 @@
|
|
|
de80c6 |
+#ifndef _TYPES_H_
|
|
|
de80c6 |
+#define _TYPES_H_
|
|
|
de80c6 |
+
|
|
|
de80c6 |
+#define min(x,y) ({ \
|
|
|
de80c6 |
+ typeof(x) _x = (x); \
|
|
|
de80c6 |
+ typeof(y) _y = (y); \
|
|
|
de80c6 |
+ (void) (&_x == &_y); \
|
|
|
de80c6 |
+ _x < _y ? _x : _y; })
|
|
|
de80c6 |
+
|
|
|
de80c6 |
+#define max(x,y) ({ \
|
|
|
de80c6 |
+ typeof(x) _x = (x); \
|
|
|
de80c6 |
+ typeof(y) _y = (y); \
|
|
|
de80c6 |
+ (void) (&_x == &_y); \
|
|
|
de80c6 |
+ _x > _y ? _x : _y; })
|
|
|
de80c6 |
+
|
|
|
de80c6 |
+#endif /* _TYPES_H_ */
|
|
|
de80c6 |
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
|
|
|
de80c6 |
index 12c589f8001c..8ce4a61fc9c2 100644
|
|
|
de80c6 |
--- a/kexec/arch/arm64/kexec-arm64.c
|
|
|
de80c6 |
+++ b/kexec/arch/arm64/kexec-arm64.c
|
|
|
de80c6 |
@@ -28,6 +28,7 @@
|
|
|
de80c6 |
#include "fs2dt.h"
|
|
|
de80c6 |
#include "kexec-syscall.h"
|
|
|
de80c6 |
#include "arch/options.h"
|
|
|
de80c6 |
+#include "types.h"
|
|
|
de80c6 |
|
|
|
de80c6 |
/* Global varables the core kexec routines expect. */
|
|
|
de80c6 |
|
|
|
de80c6 |
@@ -588,9 +589,11 @@ static uint64_t read_sink(const char *command_line)
|
|
|
de80c6 |
int arm64_load_other_segments(struct kexec_info *info,
|
|
|
de80c6 |
unsigned long kernel_entry, char *option)
|
|
|
de80c6 |
{
|
|
|
de80c6 |
- int result;
|
|
|
de80c6 |
+ int result, i;
|
|
|
de80c6 |
struct mem_ehdr ehdr;
|
|
|
de80c6 |
unsigned long dtb_base;
|
|
|
de80c6 |
+ unsigned long arm64_ram_start = -1;
|
|
|
de80c6 |
+ unsigned long arm64_ram_end = 0;
|
|
|
de80c6 |
unsigned long hole_min, hole_max;
|
|
|
de80c6 |
char *initrd_buf = NULL;
|
|
|
de80c6 |
uint64_t purgatory_sink;
|
|
|
de80c6 |
@@ -720,6 +723,17 @@ int arm64_load_other_segments(struct kexec_info *info,
|
|
|
de80c6 |
|
|
|
de80c6 |
elf_rel_set_symbol(&info->rhdr, "arm64_dtb_addr", &dtb_base,
|
|
|
de80c6 |
sizeof(dtb_base));
|
|
|
de80c6 |
+ for (i = 0; i < info->nr_segments; i++) {
|
|
|
de80c6 |
+ arm64_ram_start = min(arm64_ram_start,
|
|
|
de80c6 |
+ (unsigned long)info->segment[i].mem);
|
|
|
de80c6 |
+ arm64_ram_end = max(arm64_ram_end,
|
|
|
de80c6 |
+ ((unsigned long)info->segment[i].mem +
|
|
|
de80c6 |
+ info->segment[i].memsz));
|
|
|
de80c6 |
+ }
|
|
|
de80c6 |
+ elf_rel_set_symbol(&info->rhdr, "arm64_ram_start",
|
|
|
de80c6 |
+ &arm64_ram_start, sizeof(arm64_ram_start));
|
|
|
de80c6 |
+ elf_rel_set_symbol(&info->rhdr, "arm64_ram_end",
|
|
|
de80c6 |
+ &arm64_ram_end, sizeof(arm64_ram_end));
|
|
|
de80c6 |
}
|
|
|
de80c6 |
|
|
|
de80c6 |
return 0;
|
|
|
de80c6 |
diff --git a/purgatory/arch/arm64/entry.S b/purgatory/arch/arm64/entry.S
|
|
|
de80c6 |
index 140e91d87ab1..0713ccdec4ad 100644
|
|
|
de80c6 |
--- a/purgatory/arch/arm64/entry.S
|
|
|
de80c6 |
+++ b/purgatory/arch/arm64/entry.S
|
|
|
de80c6 |
@@ -52,3 +52,13 @@ size arm64_kernel_entry
|
|
|
de80c6 |
arm64_dtb_addr:
|
|
|
de80c6 |
.quad 0
|
|
|
de80c6 |
size arm64_dtb_addr
|
|
|
de80c6 |
+
|
|
|
de80c6 |
+.globl arm64_ram_start
|
|
|
de80c6 |
+arm64_ram_start:
|
|
|
de80c6 |
+ .quad 0
|
|
|
de80c6 |
+size arm64_ram_start
|
|
|
de80c6 |
+
|
|
|
de80c6 |
+.globl arm64_ram_end
|
|
|
de80c6 |
+arm64_ram_end:
|
|
|
de80c6 |
+ .quad 0
|
|
|
de80c6 |
+size arm64_ram_end
|
|
|
de80c6 |
--
|
|
|
de80c6 |
2.1.0
|
|
|
de80c6 |
|