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

eclair: obtain MAP_KERNEL_START from kernel image

Browse Source 
Change-Id: I946c640ddb2e2b32362760254a86c611517becf3
This commit is contained in:
Balazs Gerofi
2020-02-10 07:04:37 +00:00
parent d1df17ffb7
commit 7882110e9f
6 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
executer/user/arch/arm64/arch-eclair.c
View File

@@ -98,8 +98,8 @@ uintptr_t virt_to_phys(uintptr_t va)
return (va - MAP_ST + PHYS_OFFSET);
}
if (va >= MAP_KERNEL) {
return (va - MAP_KERNEL + kernel_base);
if (va >= MAP_KERNEL_START) {
return (va - MAP_KERNEL_START + kernel_base);
}
return NOPHYS;
@@ -107,7 +107,13 @@ uintptr_t virt_to_phys(uintptr_t va)
int arch_setup_constants(void)
{
/* Nothing here */
MAP_KERNEL_START = lookup_symbol("_head");
if (MAP_KERNEL_START == NOSYMBOL) {
fprintf(stderr, "error: obtaining MAP_KERNEL_START\n");
return 1;
}
printf("arm64 MAP_KERNEL_START 0x%lx\n", MAP_KERNEL_START);
return 0;
}

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

@@ -9,15 +9,11 @@
#
# if (CONFIG_ARM64_VA_BITS == 42)
# /* VA_BITS=42, 64K_PAGE address */
# define MAP_KERNEL 0xfffffc0007800000
# define MAP_ST 0xfffffe0000000000
# define MAP_KERNEL_TEXT "0xfffffc0007800000"
#
# elif (CONFIG_ARM64_VA_BITS == 48)
# /* VA_BITS=48, 64K_PAGE address */
# define MAP_KERNEL 0xffff000007800000
# define MAP_ST 0xffff800000000000
# define MAP_KERNEL_TEXT "0xffff000007800000"
#
# else
#
@@ -29,15 +25,11 @@
#
# if (CONFIG_ARM64_VA_BITS == 39)
# /* VA_BITS=39, 4K_PAGE address */
# define MAP_KERNEL 0xffffff8007800000
# define MAP_ST 0xffffffc000000000
# define MAP_KERNEL_TEXT "0xffffff8007800000"
#
# elif (CONFIG_ARM64_VA_BITS == 48)
# /* VA_BITS=48, 4K_PAGE address */
# define MAP_KERNEL 0xffff000007800000
# define MAP_ST 0xffff800000000000
# define MAP_KERNEL_TEXT "0xffff000007800000"
#
# else
#

10
executer/user/arch/x86_64/arch-eclair.c
View File

@@ -124,6 +124,16 @@ uintptr_t virt_to_phys(uintptr_t va)
int arch_setup_constants(void)
{
MAP_KERNEL_START = lookup_symbol("_head");
if (MAP_KERNEL_START == NOSYMBOL) {
fprintf(stderr, "error: obtaining MAP_KERNEL_START\n");
return 1;
}
/* One page extra head, see smp-x86.lds */
MAP_KERNEL_START -= 0x1000;
printf("x86 MAP_KERNEL_START 0x%lx\n", MAP_KERNEL_START);
if (read_symbol_64("linux_page_offset_base",
&linux_page_offset) != 0) {
fprintf(stderr, "error: obtaining Linux page offset\n");

1
executer/user/arch/x86_64/include/arch-eclair.h
View File

@@ -4,7 +4,6 @@
#define MAP_ST_START 0xffff800000000000UL
#define MAP_FIXED_START 0xffff860000000000UL
#define MAP_KERNEL_START 0xFFFFFFFFFE800000UL
extern unsigned long linux_page_offset;
#define ARCH_CLV_SPAN "x86_cpu_local_variables_span"