armsr: armv8: remove VA_BITS override

In kernel 6.9, arch/arm64 was changed (see Link:) to enable 52-bit
virtual addressing (using "Large Physical Addressing 2"/LPA2).

The kernel will select the appropriate addressing mode
(39/48/52-bit) for the CPU at runtime.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5d101654226d64ac0a6928019fbf476b46e9d14b
Link: https://github.com/openwrt/openwrt/pull/21433
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/armsr/armv8/config-6.18 b/target/linux/armsr/armv8/config-6.18
index eb62043c10471a9e9f9729b2ef527f8ad63d23d6..fdd42b13efc251dfa907b3cd283993c9593243fc 100644 (file)
--- a/target/linux/armsr/armv8/config-6.18
+++ b/target/linux/armsr/armv8/config-6.18
@@ -100,6 +100,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_845719=y
+# CONFIG_ARM64_FORCE_52BIT is not set
 CONFIG_ARM64_GCS=y
 CONFIG_ARM64_HAFT=y
 CONFIG_ARM64_HW_AFDBM=y
@@ -116,9 +117,9 @@ CONFIG_ARM64_SME=y
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_ARM64_TLB_RANGE=y
-CONFIG_ARM64_VA_BITS=48
 # CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
+# CONFIG_ARM64_VA_BITS_48 is not set
+CONFIG_ARM64_VA_BITS_52=y
 CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
 CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y

diff --git a/target/linux/armsr/config-6.18 b/target/linux/armsr/config-6.18
index 5abc5953d6ef5c62b14d395f2d4175f0f6e59ba3..cbcfdb38ebb5d90a612a76c9d790de574317bde4 100644 (file)
--- a/target/linux/armsr/config-6.18
+++ b/target/linux/armsr/config-6.18
@@ -62,8 +62,6 @@ CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_VA_BITS_39=y
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y