diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index ce07a84da00e..21d59b24df9f 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -1 +1,8 @@
 CONFIG_QCOM_SECURE_CHAN_MANAGER=y
+CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y
+CONFIG_IOMMU_DEBUGFS=y
+CONFIG_QCOM_LAZY_MAPPING=y
+CONFIG_IOMMU_DEBUG=y
+CONFIG_IOMMU_DEBUG_TRACKING=y
+CONFIG_IOMMU_TESTS=y
+CONFIG_QCOM_SECURE_BUFFER=y
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index aa65d708c21b..4c89412f728a 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -1,2 +1,3 @@
 CONFIG_HVC_DCC=y
 CONFIG_HVC_DCC_SERIALIZE_SMP=y
+CONFIG_IOMMU_TLBSYNC_DEBUG=y