Reviewed-by: Xiongfeng Wang wangxiongfeng2@huawei.com
On 2021/3/24 15:29, sangyan@huawei.com wrote:
From: Sang Yan sangyan@huawei.com
hulk inclusion category: feature bugzilla: 48159 CVE: N/A
Move config of ARM64_CPU_PARK into menu "Kernel features" and beside CRASH_DUMP.
Move config of ARM64_PMEM_RESERVE ARM64_PMEM_LEGACY_DEVICE into menu "Kernel features".
Signed-off-by: Sang Yan sangyan@huawei.com
arch/arm64/Kconfig | 66 +++++++++++++++++----------------- arch/arm64/configs/openeuler_defconfig | 6 ++-- 2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 326f26d..72c7ce3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -345,42 +345,9 @@ config KASAN_SHADOW_OFFSET default 0xeffffff900000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS default 0xffffffffffffffff
-config ARM64_CPU_PARK
- bool "Support CPU PARK on kexec"
- depends on SMP
- depends on KEXEC_CORE
- help
This enables support for CPU PARK feature inorder to save time of cpu down to up.CPU park is a state through kexec, spin loopinstead of cpu die before jumping to new kernel,jumping out from loop to new kernel entry insmp_init.config ARCH_HAS_CPU_RELAX def_bool y
-config ARM64_PMEM_RESERVE
- bool "Reserve memory for persistent storage"
- default n
- help
Use memmap=nn[KMG]!ss[KMG](memmap=100K!0x1a0000000) reservememory for persistent storage.Say y here to enable this feature.-config ARM64_PMEM_LEGACY_DEVICE
- bool "Create persistent storage"
- depends on BLK_DEV
- depends on LIBNVDIMM
- select ARM64_PMEM_RESERVE
- help
Use reserved memory for persistent storage when the kernelrestart or update. the data in PMEM will not be lost andcan be loaded faster.Say y if unsure.source "arch/arm64/Kconfig.platforms"
menu "Kernel Features" @@ -1196,6 +1163,18 @@ config CRASH_DUMP
For more details see Documentation/admin-guide/kdump/kdump.rst+config ARM64_CPU_PARK
- bool "Support CPU PARK on kexec"
- depends on SMP
- depends on KEXEC_CORE
- help
This enables support for CPU PARK feature inorder to save time of cpu down to up.CPU park is a state through kexec, spin loopinstead of cpu die before jumping to new kernel,jumping out from loop to new kernel entry insmp_init.config XEN_DOM0 def_bool y depends on XEN @@ -1257,6 +1236,27 @@ config RODATA_FULL_DEFAULT_ENABLED This requires the linear region to be mapped down to pages, which may adversely affect performance in some cases.
+config ARM64_PMEM_RESERVE
- bool "Reserve memory for persistent storage"
- default n
- help
Use memmap=nn[KMG]!ss[KMG](memmap=100K!0x1a0000000) reservememory for persistent storage.Say y here to enable this feature.+config ARM64_PMEM_LEGACY_DEVICE
- bool "Create persistent storage"
- depends on BLK_DEV
- depends on LIBNVDIMM
- select ARM64_PMEM_RESERVE
- help
Use reserved memory for persistent storage when the kernelrestart or update. the data in PMEM will not be lost andcan be loaded faster.Say y if unsure.config ARM64_SW_TTBR0_PAN bool "Emulate Privileged Access Never using TTBR0_EL1 switching" help diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 21c5d11..1aedaf3 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -275,9 +275,6 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=3 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_ARM64_CPU_PARK=y -CONFIG_ARM64_PMEM_RESERVE=y -CONFIG_ARM64_PMEM_LEGACY_DEVICE=y
# # Platform selection @@ -407,10 +404,13 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_KEXEC=y # CONFIG_KEXEC_FILE is not set CONFIG_CRASH_DUMP=y +CONFIG_ARM64_CPU_PARK=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y +CONFIG_ARM64_PMEM_RESERVE=y +CONFIG_ARM64_PMEM_LEGACY_DEVICE=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_ARM64_ILP32=y