diff options
| author |   Steve Capper <steve.capper@arm.com> | 2019-08-07 16:55:22 +0100 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2019-08-09 11:17:26 +0100 |
| commit | b6d00d47e81a49f6cf462518c10408f37a3e6785 (patch) | |
| tree | f84df6281b176ab0f3c2fea47d8b9ef233f15b6a /arch/arm64/mm/proc.S | |
| parent | arm64: mm: Modify calculation of VMEMMAP_SIZE (diff) | |
| download | linux-dev-b6d00d47e81a49f6cf462518c10408f37a3e6785.tar.xz linux-dev-b6d00d47e81a49f6cf462518c10408f37a3e6785.zip | |
arm64: mm: Introduce 52-bit Kernel VAs
Most of the machinery is now in place to enable 52-bit kernel VAs that
are detectable at boot time.
This patch adds a Kconfig option for 52-bit user and kernel addresses
and plumbs in the requisite CONFIG_ macros as well as sets TCR.T1SZ,
physvirt_offset and vmemmap at early boot.
To simplify things this patch also removes the 52-bit user/48-bit kernel
kconfig option.
Signed-off-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm/proc.S')
| -rw-r--r-- | arch/arm64/mm/proc.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 8d289ff7584d..8b021c5c0884 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -438,10 +438,11 @@ ENTRY(__cpu_setup) TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS tcr_clear_errata_bits x10, x9, x5 -#ifdef CONFIG_ARM64_USER_VA_BITS_52 +#ifdef CONFIG_ARM64_VA_BITS_52 ldr_l x9, vabits_user sub x9, xzr, x9 add x9, x9, #64 + tcr_set_t1sz x10, x9 #else ldr_l x9, idmap_t0sz #endif |