gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eclair and ldump2mcdump: obtain PHYS_OFFSET from dump_mem_chunks

Browse Source 
Change-Id: I5dd5f9e7e6b5817e50b0a1855b67f163d3029f17
This commit is contained in:
Balazs Gerofi
2020-02-04 23:30:28 +00:00
parent 7882110e9f
commit 6bef773741
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
executer/user/arch/arm64/include/arch-eclair.h
View File

@ -2,9 +2,6 @@
#ifndef HEADER_USER_ARM64_ECLAIR_H #ifndef HEADER_USER_ARM64_ECLAIR_H
#define HEADER_USER_ARM64_ECLAIR_H #define HEADER_USER_ARM64_ECLAIR_H
/* PHYS_OFFSET needs to be changed according to the environment. */
#define PHYS_OFFSET 0x40000000
#ifdef CONFIG_ARM64_64K_PAGES #ifdef CONFIG_ARM64_64K_PAGES
# #
# if (CONFIG_ARM64_VA_BITS == 42) # if (CONFIG_ARM64_VA_BITS == 42)

3
executer/user/eclair.c
View File

@ -60,6 +60,8 @@ struct thread_info {
uintptr_t arch_clv; uintptr_t arch_clv;
}; /* struct thread_info */ }; /* struct thread_info */
/* Physical memory start addr (non-zero on ARM64) */
unsigned long PHYS_OFFSET;
/* Virtual address where McKernel is mapped to */ /* Virtual address where McKernel is mapped to */
unsigned long MAP_KERNEL_START; unsigned long MAP_KERNEL_START;
@ -605,6 +607,7 @@ static int setup_dump(char *fname) {
} }
kernel_base = mem_chunks->kernel_base; kernel_base = mem_chunks->kernel_base;
PHYS_OFFSET = mem_chunks->phys_start;
for (i = 0; i < mem_info.nr_chunks; ++i) { for (i = 0; i < mem_info.nr_chunks; ++i) {
memset(physmem_name,0,sizeof(physmem_name)); memset(physmem_name,0,sizeof(physmem_name));

1
executer/user/eclair.h
View File

@ -8,6 +8,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <arch-eclair.h> #include <arch-eclair.h>
extern unsigned long PHYS_OFFSET;
extern unsigned long MAP_KERNEL_START; extern unsigned long MAP_KERNEL_START;
/* common */ /* common */

2
executer/user/ldump2mcdump.c
View File

@ -50,6 +50,8 @@ struct dump_mem_chunk {
typedef struct dump_mem_chunks_s { typedef struct dump_mem_chunks_s {
int nr_chunks; int nr_chunks;
unsigned long kernel_base; unsigned long kernel_base;
/* memstart_addr in aarch64 */
unsigned long phys_start;
struct dump_mem_chunk chunks[]; struct dump_mem_chunk chunks[];
} dump_mem_chunks_t; } dump_mem_chunks_t;

2
ihk

Submodule ihk updated: fdd513f41c...b053576c89