---

yaml --- r: 320748 b: refs/heads/master c: 73fa0d1 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · c485178 · c485178
1 parent 5c7293d
commit c485178
Show file tree

Hide file tree

Showing 6 changed files with 822 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a5b2a20ec87384eeb19e70991e7e15a00cad87b
+refs/heads/master: 73fa0d10d077d9521ee2dace2307ae2c9a965336
diff --git a/trunk/drivers/vfio/Kconfig b/trunk/drivers/vfio/Kconfig
@@ -1,6 +1,12 @@
+config VFIO_IOMMU_TYPE1
+	tristate
+	depends on VFIO
+	default n
+
 menuconfig VFIO
 	tristate "VFIO Non-Privileged userspace driver framework"
 	depends on IOMMU_API
+	select VFIO_IOMMU_TYPE1 if X86
 	help
 	  VFIO provides a framework for secure userspace device drivers.
 	  See Documentation/vfio.txt for more details.

diff --git a/trunk/drivers/vfio/Makefile b/trunk/drivers/vfio/Makefile
@@ -1 +1,3 @@
 obj-$(CONFIG_VFIO) += vfio.o
+obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o
+obj-$(CONFIG_VFIO_PCI) += pci/
diff --git a/trunk/drivers/vfio/vfio.c b/trunk/drivers/vfio/vfio.c
@@ -1376,6 +1376,13 @@ static int __init vfio_init(void)
 
 	pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
+	/*
+	 * Attempt to load known iommu-drivers.  This gives us a working
+	 * environment without the user needing to explicitly load iommu
+	 * drivers.
+	 */
+	request_module_nowait("vfio_iommu_type1");
+
 	return 0;
 
 err_groups_cdev: