Following arm64-support to development branch
This includes the following fixes: * fix build of arch/arm64/kernel/vdso Change-Id: I73b05034d29f7f8731ac17f9736edbba4fb2c639
This commit is contained in:
committed by
Dominique Martinet
parent
e52d748744
commit
d4d78e9c61
@ -1,11 +1,48 @@
|
||||
/* arch-eclair.h COPYRIGHT FUJITSU LIMITED 2016 */
|
||||
/* arch-eclair.h COPYRIGHT FUJITSU LIMITED 2016-2018 */
|
||||
#ifndef HEADER_USER_ARM64_ECLAIR_H
|
||||
#define HEADER_USER_ARM64_ECLAIR_H
|
||||
|
||||
/* VA_BITS=48, 4K_PAGE address */
|
||||
#define MAP_KERNEL 0xffffffffff800000
|
||||
#define MAP_ST 0xffff800000000000
|
||||
#define MAP_KERNEL_TEXT "0xffffffffff800000"
|
||||
#ifdef CONFIG_ARM64_64K_PAGES
|
||||
#
|
||||
# if (CONFIG_ARM64_VA_BITS == 42)
|
||||
# /* VA_BITS=42, 64K_PAGE address */
|
||||
# define MAP_KERNEL 0xffffffffe0000000
|
||||
# define MAP_ST 0xfffffe0000000000
|
||||
# define MAP_KERNEL_TEXT "0xffffffffe0000000"
|
||||
#
|
||||
# elif (CONFIG_ARM64_VA_BITS == 48)
|
||||
# /* VA_BITS=48, 64K_PAGE address */
|
||||
# define MAP_KERNEL 0xffffffffe0000000
|
||||
# define MAP_ST 0xffff800000000000
|
||||
# define MAP_KERNEL_TEXT "0xffffffffe0000000"
|
||||
#
|
||||
# else
|
||||
#
|
||||
# error "No support VA_BITS and PAGE_SIZE"
|
||||
#
|
||||
# endif
|
||||
#
|
||||
#else /* CONFIG_ARM64_64K_PAGES */
|
||||
#
|
||||
# if (CONFIG_ARM64_VA_BITS == 39)
|
||||
# /* VA_BITS=39, 4K_PAGE address */
|
||||
# define MAP_KERNEL 0xffffffffff800000
|
||||
# define MAP_ST 0xffffffc000000000
|
||||
# define MAP_KERNEL_TEXT "0xffffffffff800000"
|
||||
#
|
||||
# elif (CONFIG_ARM64_VA_BITS == 48)
|
||||
# /* VA_BITS=48, 4K_PAGE address */
|
||||
# define MAP_KERNEL 0xffffffffff800000
|
||||
# define MAP_ST 0xffff800000000000
|
||||
# define MAP_KERNEL_TEXT "0xffffffffff800000"
|
||||
#
|
||||
# else
|
||||
#
|
||||
# error "No support VA_BITS and PAGE_SIZE"
|
||||
#
|
||||
# endif
|
||||
#
|
||||
#endif /* CONFIG_ARM64_64K_PAGES */
|
||||
|
||||
#define ARCH_CLV_SPAN "arm64_cpu_local_variables_span"
|
||||
|
||||
@ -13,7 +50,7 @@
|
||||
|
||||
#define ARCH_REGS 34
|
||||
|
||||
#define PANIC_REGS_OFFSET 144
|
||||
#define PANIC_REGS_OFFSET 160
|
||||
|
||||
struct arch_kregs {
|
||||
unsigned long x19, x20, x21, x22, x23;
|
||||
@ -21,4 +58,8 @@ struct arch_kregs {
|
||||
unsigned long fp, sp, pc;
|
||||
};
|
||||
|
||||
#ifdef POSTK_DEBUG_ARCH_DEP_34
|
||||
uintptr_t virt_to_phys(uintptr_t va);
|
||||
#endif /* POSTK_DEBUG_ARCH_DEP_34 */
|
||||
|
||||
#endif /* HEADER_USER_ARM64_ECLAIR_H */
|
||||
|
||||
Reference in New Issue
Block a user