[openwrt/openwrt] generic: 5.15, 6.1: enable CNP support

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/b42f7a1b305d370c71e4f358de942df97d6347df

commit b42f7a1b305d370c71e4f358de942df97d6347df
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Thu Aug 22 11:45:16 2024 +0200

    generic: 5.15, 6.1: enable CNP support
    
    Ever since CONFIG_ARM64_PAN was enabled Common Not Private (CNP) is now
    visible and kernel builds will stop as they are not set in kernel config
    for 5.15 and 6.1.
    
    So, lets enable Common Not Private (CNP) which is ARMv8.2 feature and will
    be NOP of CPU-s that dont support it.
    
    Fixes: a2662309aae1 ("kernel: Enable CONFIG_ARM64_PAN to restrict kernel access to user space memory")
    Link: https://github.com/openwrt/openwrt/pull/16211
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/generic/config-5.15 | 2 ++
 target/linux/generic/config-6.1  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 1b8ad1cf42..9711b8372f 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -318,8 +318,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_64K_PAGES is not set
 # CONFIG_ARM64_AMU_EXTN is not set
 # CONFIG_ARM64_BTI is not set
+CONFIG_ARM64_CNP=y
 # CONFIG_ARM64_CRYPTO is not set
 # CONFIG_ARM64_E0PD is not set
+# CONFIG_ARM64_EPAN is not set
 # CONFIG_ARM64_ERRATUM_1024718 is not set
 # CONFIG_ARM64_ERRATUM_1165522 is not set
 # CONFIG_ARM64_ERRATUM_1286807 is not set
diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
index 81c66f41df..ef4ab7bac1 100644
--- a/target/linux/generic/config-6.1
+++ b/target/linux/generic/config-6.1
@@ -348,8 +348,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_64K_PAGES is not set
 # CONFIG_ARM64_AMU_EXTN is not set
 # CONFIG_ARM64_BTI is not set
+CONFIG_ARM64_CNP=y
 # CONFIG_ARM64_CRYPTO is not set
 # CONFIG_ARM64_E0PD is not set
+# CONFIG_ARM64_EPAN is not set
 # CONFIG_ARM64_ERRATUM_1024718 is not set
 # CONFIG_ARM64_ERRATUM_1165522 is not set
 # CONFIG_ARM64_ERRATUM_1286807 is not set