diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index b73690cc948c..44ef6d39cf9c 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -50,6 +50,8 @@ CONFIG_ARM_MEMLAT_MON=y
 CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y
 CONFIG_DEVFREQ_GOV_MEMLAT=y
 CONFIG_DEVFREQ_SIMPLE_DEV=y
+CONFIG_EDAC_QCOM=y
+CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y
 CONFIG_QCOM_DEVFREQ_ICC=y
 CONFIG_QCOM_LLCC_PMU=y
 CONFIG_QTI_TZ_LOG=y
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 6fd94723c992..b7d50514fbeb 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -20,6 +20,7 @@ CONFIG_I2C_MSM_GENI=y
 CONFIG_SPI_MSM_GENI=y
 CONFIG_MSM_GPI_DMA=y
 CONFIG_MSM_GPI_DMA_DEBUG=y
+CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y
 CONFIG_I3C=y
 CONFIG_I3C_MASTER_MSM_GENI=y
 # CONFIG_CDNS_I3C_MASTER is not set