From 41c3e083e830ce7ab568ccd6000397a7c888d11d Mon Sep 17 00:00:00 2001
From: Mostafa Saleh <smostafa@google.com>
Date: Thu, 16 Jan 2025 15:25:00 +0000
Subject: [PATCH] ANDROID: gki: Enable VFIO platform and pKVM IOMMU

pKVM relies on VFIO-platform for device-assignement, enable it's
config and pKVM IOMMU VFIO type.

Bug: 357781595
Bug: 348382247
Change-Id: I93956e72a99a23dd6cff712309ada8b008930eba
Signed-off-by: Mostafa Saleh <smostafa@google.com>
---
 arch/arm64/configs/gki_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 4a7f6c66306e..19e18a952be3 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -575,6 +575,9 @@ CONFIG_RTC_DRV_PL031=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_SYSFS_STATS=y
 CONFIG_UIO=y
+CONFIG_VFIO=y
+CONFIG_VFIO_PKVM_IOMMU=y
+CONFIG_VFIO_PLATFORM=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_ARM_PKVM_GUEST=y
 CONFIG_MTK_GZVM=m