Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / drivers / vdpa / Kconfig

diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig
index a503c1b..3d91982 100644 (file)
--- a/drivers/vdpa/Kconfig
+++ b/drivers/vdpa/Kconfig
@@ -33,6 +33,16 @@ config VDPA_SIM_BLOCK
          vDPA block device simulator which terminates IO request in a
          memory buffer.
 
+config VDPA_USER
+       tristate "VDUSE (vDPA Device in Userspace) support"
+       depends on EVENTFD && MMU && HAS_DMA
+       select DMA_OPS
+       select VHOST_IOTLB
+       select IOMMU_IOVA
+       help
+         With VDUSE it is possible to emulate a vDPA Device
+         in a userspace program.
+
 config IFCVF
        tristate "Intel IFC VF vDPA driver"
        depends on PCI_MSI
@@ -53,6 +63,7 @@ config MLX5_VDPA
 config MLX5_VDPA_NET
        tristate "vDPA driver for ConnectX devices"
        select MLX5_VDPA
+       select VHOST_RING
        depends on MLX5_CORE
        help
          VDPA network driver for ConnectX6 and newer. Provides offloading