From 359d67a0a0e214a9c56edb35c71b33d1f5b42f7d Mon Sep 17 00:00:00 2001 From: "a@b.com" Date: Wed, 12 Apr 2023 13:43:37 +0800 Subject: [PATCH] fix v4 Signed-off-by: a@b.com --- arch/arm64/configs/armdesktop_defconfig | 84 ++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/arch/arm64/configs/armdesktop_defconfig b/arch/arm64/configs/armdesktop_defconfig index 20072f067c4b..31e48dee3815 100644 --- a/arch/arm64/configs/armdesktop_defconfig +++ b/arch/arm64/configs/armdesktop_defconfig @@ -8,6 +8,8 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y CONFIG_RCU_EXPERT=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y @@ -47,16 +49,76 @@ CONFIG_ARCH_PHYTIUM_EC=y CONFIG_PHYTIUM_S3_TIMEOUT=y CONFIG_ARM64_VA_BITS_39=y CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y +CONFIG_NUMA=y +CONFIG_NODES_SHIFT=6 CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=n CONFIG_COMPAT=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -CONFIG_ARM64_PMEM=y -CONFIG_RANDOMIZE_BASE=y + +# +# ARMv8.1 architectural features +# +# CONFIG_ARM64_HW_AFDBM is not set +# CONFIG_ARM64_PAN is not set +#CONFIG_AS_HAS_LSE_ATOMICS=y +# CONFIG_ARM64_USE_LSE_ATOMICS is not set +# CONFIG_ARM64_VHE is not set +# end of ARMv8.1 architectural features + +# +# ARMv8.2 architectural features +# +# CONFIG_ARM64_UAO is not set +# CONFIG_ARM64_PMEM is not set +# CONFIG_ARM64_RAS_EXTN is not set +# CONFIG_ARM64_CNP is not set +# end of ARMv8.2 architectural features + +# +# ARMv8.3 architectural features +# +# CONFIG_ARM64_PTR_AUTH is not set +#CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y +#CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y +#CONFIG_AS_HAS_PAC=y +#CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y +# end of ARMv8.3 architectural features + +# +# ARMv8.4 architectural features +# +# CONFIG_ARM64_AMU_EXTN is not set +#CONFIG_AS_HAS_ARMV8_4=y +# CONFIG_ARM64_TLB_RANGE is not set +# end of ARMv8.4 architectural features + +# +# ARMv8.5 architectural features +# +# CONFIG_ARM64_BTI is not set +#CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y +# CONFIG_ARM64_E0PD is not set +# CONFIG_ARCH_RANDOM is not set +#CONFIG_ARM64_AS_HAS_MTE=y +# CONFIG_ARM64_MTE is not set +# end of ARMv8.5 architectural features + +CONFIG_ARM64_SVE=y +CONFIG_ARM64_MODULE_PLTS=y +# CONFIG_ARM64_PSEUDO_NMI is not set +CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_STACKPROTECTOR_PER_TASK=y +# end of Kernel Features + +# +# Boot options CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_CMDLINE="pcie_aspm=off" CONFIG_CMDLINE_EXTEND=y @@ -103,8 +165,6 @@ CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_CONFIGFS=m CONFIG_PMIC_OPREGION=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=m CONFIG_CRYPTO_SHA2_ARM64_CE=m @@ -119,7 +179,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=m CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_KPROBES=y -#CONFIG_JUMP_LABEL=y +CONFIG_JUMP_LABEL=y # CONFIG_VMAP_STACK is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y @@ -2370,12 +2430,12 @@ CONFIG_DRM_HDLCD=m CONFIG_DRM_MALI_DISPLAY=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_USERPTR=y -CONFIG_DRM_AMDGPU=m +CONFIG_DRM_AMDGPU=y CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_ACP=y -CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_NOUVEAU=y CONFIG_DRM_VGEM=m CONFIG_DRM_UDL=m CONFIG_DRM_AST=m @@ -2966,6 +3026,7 @@ CONFIG_PHY_SAMSUNG_USB2=m CONFIG_PHY_TUSB1210=m CONFIG_POWERCAP=y CONFIG_HISI_PMU=y +CONFIG_LIBNVDIMM=y CONFIG_STM=y CONFIG_STM_SOURCE_CONSOLE=y CONFIG_EXT2_FS=m @@ -3147,6 +3208,8 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 #CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_APPARMOR=y # CONFIG_SECURITY_ELFVERIFY is not set +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_IMA=y @@ -3209,6 +3272,8 @@ CONFIG_DEBUG_INFO=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 CONFIG_LOCKUP_DETECTOR=y @@ -3217,7 +3282,8 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_DEBUG=y +CONFIG_SCHEDSTATS=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_TRACE is not set CONFIG_FUNCTION_TRACER=y