diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 9c6cceb40a6b..b872e29b1458 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -7,3 +7,5 @@ CONFIG_IOMMU_DEBUG_TRACKING=y
 CONFIG_IOMMU_TESTS=y
 CONFIG_QCOM_SECURE_BUFFER=y
 # CONFIG_ZONE_DMA32 is not set
+CONFIG_EDAC_KRYO_ARM64=y
+CONFIG_EDAC_KRYO_ARM64_PANIC_ON_UE=y
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 4c89412f728a..ea9c28b0cf6f 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -1,3 +1,4 @@
 CONFIG_HVC_DCC=y
 CONFIG_HVC_DCC_SERIALIZE_SMP=y
 CONFIG_IOMMU_TLBSYNC_DEBUG=y
+CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y