summaryrefslogtreecommitdiffstats
path: root/drivers/vfio
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2014-11-14 09:10:59 -0700
committerAlex Williamson <alex.williamson@redhat.com>2014-11-14 09:10:59 -0700
commit5e9f36c59a4883c6d8db4a3c097e4fc2234742de (patch)
treebedebec521847d2ce7a15fef864eaf3db5006223 /drivers/vfio
parent1d53a3a7d3b886bcc60b90e41693b82a791c25ba (diff)
downloadop-kernel-dev-5e9f36c59a4883c6d8db4a3c097e4fc2234742de.zip
op-kernel-dev-5e9f36c59a4883c6d8db4a3c097e4fc2234742de.tar.gz
drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU
The ARM SMMU driver is compatible with the notion of a type-1 IOMMU in VFIO. This patch allows VFIO_IOMMU_TYPE1 to be selected if ARM_SMMU=y. Signed-off-by: Will Deacon <will.deacon@arm.com> [aw: update for existing S390 patch] Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r--drivers/vfio/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig
index b93c259..14e27ab 100644
--- a/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@@ -16,7 +16,7 @@ config VFIO_SPAPR_EEH
menuconfig VFIO
tristate "VFIO Non-Privileged userspace driver framework"
depends on IOMMU_API
- select VFIO_IOMMU_TYPE1 if (X86 || S390)
+ select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM_SMMU)
select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES)
select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES)
select ANON_INODES
OpenPOWER on IntegriCloud