diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig
index 0cd60e984c6363585a9733f905861e1799dce2ce..f3d83ee6f6fdc9d65885fabb45332e466cf5e8f7 100644
--- a/arch/arm64/configs/hulk_defconfig
+++ b/arch/arm64/configs/hulk_defconfig
@@ -4566,11 +4566,19 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+
+#
+# Generic PASID table support
+#
+CONFIG_IOMMU_PASID_TABLE=y
+CONFIG_ARM_SMMU_V3_CONTEXT=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
+CONFIG_IOMMU_PAGE_FAULT=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 # CONFIG_QCOM_IOMMU is not set
diff --git a/arch/arm64/configs/syzkaller_defconfig b/arch/arm64/configs/syzkaller_defconfig
index 369ef8f787020b7b64e11f18c8b0bf7fee8e2796..917e078400161002cb74f48b925f1885943c6f79 100644
--- a/arch/arm64/configs/syzkaller_defconfig
+++ b/arch/arm64/configs/syzkaller_defconfig
@@ -4543,11 +4543,19 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+
+#
+# Generic PASID table support
+#
+CONFIG_IOMMU_PASID_TABLE=y
+CONFIG_ARM_SMMU_V3_CONTEXT=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_IOVA=y
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
+CONFIG_IOMMU_PAGE_FAULT=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 # CONFIG_QCOM_IOMMU is not set