Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / misc / mic / Kconfig

diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index e9f2f56c370de4fb3c61fb638bd9ccc7dd54efc3..40677df7f996b8508939743808504b27c144cb86 100644 (file)
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -36,7 +36,7 @@ comment "Intel MIC Host Driver"
 
 config INTEL_MIC_HOST
        tristate "Intel MIC Host Driver"
-       depends on 64BIT && PCI && X86 && INTEL_MIC_BUS && SCIF_BUS
+       depends on 64BIT && PCI && X86 && INTEL_MIC_BUS && SCIF_BUS && MIC_COSM
        select VHOST_RING
        help
          This enables Host Driver support for the Intel Many Integrated
@@ -56,7 +56,7 @@ comment "Intel MIC Card Driver"
 
 config INTEL_MIC_CARD
        tristate "Intel MIC Card Driver"
-       depends on 64BIT && X86 && INTEL_MIC_BUS && SCIF_BUS
+       depends on 64BIT && X86 && INTEL_MIC_BUS && SCIF_BUS && MIC_COSM
        select VIRTIO
        help
          This enables card driver support for the Intel Many Integrated
@@ -74,7 +74,8 @@ comment "SCIF Driver"
 
 config SCIF
        tristate "SCIF Driver"
-       depends on 64BIT && PCI && X86 && SCIF_BUS
+       depends on 64BIT && PCI && X86 && SCIF_BUS && IOMMU_SUPPORT
+       select IOMMU_IOVA
        help
          This enables SCIF Driver support for the Intel Many Integrated
          Core (MIC) family of PCIe form factor coprocessor devices that
@@ -88,3 +89,21 @@ config SCIF
          More information about the Intel MIC family as well as the Linux
          OS and tools for MIC to use with this driver are available from
          <http://software.intel.com/en-us/mic-developer>.
+
+comment "Intel MIC Coprocessor State Management (COSM) Drivers"
+
+config MIC_COSM
+       tristate "Intel MIC Coprocessor State Management (COSM) Drivers"
+       depends on 64BIT && PCI && X86 && SCIF
+       help
+         This enables COSM driver support for the Intel Many
+         Integrated Core (MIC) family of PCIe form factor coprocessor
+         devices. COSM drivers implement functions such as boot,
+         shutdown, reset and reboot of MIC devices.
+
+         If you are building a host kernel with an Intel MIC device then
+         say M (recommended) or Y, else say N. If unsure say N.
+
+         More information about the Intel MIC family as well as the Linux
+         OS and tools for MIC to use with this driver are available from
+         <http://software.intel.com/en-us/mic-developer>.