From f2f127dcdffae9045d347d5b5344feeecb729ab4 Mon Sep 17 00:00:00 2001 From: Branden Bonaby Date: Tue, 28 Jul 2020 17:03:40 -0700 Subject: [PATCH] arm64: defconfig: Set panic timeout and panic oops config To allow the Secure VM to function similarly to the primary VM during a panic, the panic timeout and panic on oops configs need to be set the same way they are set in the generic GKI configs. Currently this is not set so the default is 0, meaning that during a panic the watchdog becomes disabled and the system does not reboot. Change-Id: Ib92df399da28cd8a39ad7d972fcc56fa2ad0f46a Signed-off-by: Branden Bonaby --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index 3f9a3e5f7f43..4d0340a5c8a9 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -345,6 +345,8 @@ CONFIG_DEBUG_INFO=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y +CONFIG_PANIC_ON_OOPS=y +CONFIG_PANIC_TIMEOUT=-1 # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set CONFIG_STACKTRACE=y