diff --git a/arch/arm64/configs/vendor/gen3auto_debug.config b/arch/arm64/configs/vendor/gen3auto_debug.config
index 3fcc2460c673..ef65cc83156b 100644
--- a/arch/arm64/configs/vendor/gen3auto_debug.config
+++ b/arch/arm64/configs/vendor/gen3auto_debug.config
@@ -9,3 +9,5 @@ CONFIG_RCU_TORTURE_TEST=m
 CONFIG_SERIAL_MSM_GENI_CONSOLE=y
 CONFIG_PM_DEBUG=y
 CONFIG_COMMON_CLK_QCOM_DEBUG=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y