diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 09c527393c99..5eeec0259d1b 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -24,3 +24,11 @@ CONFIG_QCOM_SMSM=m
 CONFIG_MSM_QMP=m
 CONFIG_QCOM_SMP2P_SLEEPSTATE=m
 CONFIG_SENSORS_SSC=m
+CONFIG_MSM_SUBSYSTEM_RESTART=m
+CONFIG_SETUP_SSR_NOTIF_TIMEOUTS=y
+CONFIG_SSR_SYSMON_NOTIF_TIMEOUT=20000
+CONFIG_SSR_SUBSYS_NOTIF_TIMEOUT=20000
+CONFIG_PANIC_ON_SSR_NOTIF_TIMEOUT=y
+CONFIG_MSM_PIL_SSR_GENERIC=m
+CONFIG_MSM_SERVICE_LOCATOR=m
+CONFIG_MSM_SERVICE_NOTIFIER=m