From ea57b36497dbee434935b7c4b6fa028631393cdc Mon Sep 17 00:00:00 2001 From: Xiongfeng Wang Date: Fri, 15 Feb 2019 17:27:00 +0800 Subject: [PATCH] config: enable SDEI and NMI_WATCHDOG euler inclusion category: feature Bugzilla: 5515 CVE: N/A ---------------------------------------- config: enable SDEI and NMI_WATCHDOG Signed-off-by: Xiongfeng Wang Reviewed-by: Xie XiuQi Signed-off-by: Yang Yingliang --- arch/arm64/configs/hulk_defconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 1c45a61f5830..2db6be970129 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -556,7 +556,7 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_SCMI_PROTOCOL is not set CONFIG_ARM_SCPI_PROTOCOL=m CONFIG_ARM_SCPI_POWER_DOMAIN=m -# CONFIG_ARM_SDE_INTERFACE is not set +CONFIG_ARM_SDE_INTERFACE=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y CONFIG_FW_CFG_SYSFS=y @@ -694,6 +694,8 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y CONFIG_HAVE_CLK=y CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_NMI_WATCHDOG=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y @@ -5430,6 +5432,11 @@ CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_SDEI_WATCHDOG=y +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y +CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -- GitLab