Skip to content

Commit 5d10165

Browse files
ardbiesheuvelctmarinas
authored andcommitted
arm64: defconfig: Enable LPA2 support
We typically enable support in defconfig for all architectural features for which we can detect at runtime if the hardware actually supports them. Now that we have implemented support for LPA2 based 52-bit virtual addressing in a way that should not impact 48-bit operation on non-LPA2 CPU, we can do the same, and enable 52-bit virtual addressing by default. Catalin adds: Currently the "Virtual address space size" arch/arm64/Kconfig menu entry sets different defaults for each page size. However, all are overridden by the defconfig to 48 bits. Set the new default in Kconfig and remove the defconfig line. [ardb: squash follow-up fix from Catalin] Signed-off-by: Ard Biesheuvel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 352b039 commit 5d10165

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

arch/arm64/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,9 +1283,7 @@ endchoice
12831283

12841284
choice
12851285
prompt "Virtual address space size"
1286-
default ARM64_VA_BITS_39 if ARM64_4K_PAGES
1287-
default ARM64_VA_BITS_47 if ARM64_16K_PAGES
1288-
default ARM64_VA_BITS_42 if ARM64_64K_PAGES
1286+
default ARM64_VA_BITS_52
12891287
help
12901288
Allows choosing one of multiple possible virtual address
12911289
space sizes. The level of translation table is determined by

arch/arm64/configs/defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ CONFIG_ARCH_VEXPRESS=y
7676
CONFIG_ARCH_VISCONTI=y
7777
CONFIG_ARCH_XGENE=y
7878
CONFIG_ARCH_ZYNQMP=y
79-
CONFIG_ARM64_VA_BITS_48=y
8079
CONFIG_SCHED_MC=y
8180
CONFIG_SCHED_SMT=y
8281
CONFIG_NUMA=y

0 commit comments

Comments
 (0)