These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / scsi / Kconfig

diff --git a/kernel/drivers/scsi/Kconfig b/kernel/drivers/scsi/Kconfig
index b021bcb..64eed87 100644 (file)
--- a/kernel/drivers/scsi/Kconfig
+++ b/kernel/drivers/scsi/Kconfig
@@ -52,7 +52,7 @@ config SCSI_MQ_DEFAULT
          This option enables the new blk-mq based I/O path for SCSI
          devices by default.  With the option the scsi_mod.use_blk_mq
          module/boot option defaults to Y, without it to N, but it can
-         still be overriden either way.
+         still be overridden either way.
 
          If unsure say N.
 
@@ -242,13 +242,6 @@ config SCSI_SCAN_ASYNC
          system continues booting, and even probe devices on different
          busses in parallel, leading to a significant speed-up.
 
-         If you have built SCSI as modules, enabling this option can
-         be a problem as the devices may not have been found by the
-         time your system expects them to have been.  You can load the
-         scsi_wait_scan module to ensure that all scans have completed.
-         If you build your SCSI drivers into the kernel, then everything
-         will work fine if you say Y here.
-
          You can override this choice by specifying "scsi_mod.scan=sync"
          or async on the kernel's command line.
 
@@ -345,6 +338,7 @@ source "drivers/scsi/cxgbi/Kconfig"
 source "drivers/scsi/bnx2i/Kconfig"
 source "drivers/scsi/bnx2fc/Kconfig"
 source "drivers/scsi/be2iscsi/Kconfig"
+source "drivers/scsi/cxlflash/Kconfig"
 
 config SGIWD93_SCSI
        tristate "SGI WD93C93 SCSI Driver"
@@ -370,6 +364,7 @@ config SCSI_HPSA
        tristate "HP Smart Array SCSI driver"
        depends on PCI && SCSI
        select CHECK_SIGNATURE
+       select SCSI_SAS_ATTRS
        help
          This driver supports HP Smart Array Controllers (circa 2009).
          It is a SCSI alternative to the cciss driver, which is a block
@@ -503,8 +498,9 @@ config SCSI_DPT_I2O
 
 config SCSI_ADVANSYS
        tristate "AdvanSys SCSI support"
-       depends on SCSI && VIRT_TO_BUS && !ARM
+       depends on SCSI
        depends on ISA || EISA || PCI
+       depends on ISA_DMA_API || !ISA
        help
          This is a driver for all SCSI host adapters manufactured by
          AdvanSys. It is documented in the kernel source in
@@ -540,7 +536,6 @@ config SCSI_ARCMSR
 
 source "drivers/scsi/esas2r/Kconfig"
 source "drivers/scsi/megaraid/Kconfig.megaraid"
-source "drivers/scsi/mpt2sas/Kconfig"
 source "drivers/scsi/mpt3sas/Kconfig"
 source "drivers/scsi/ufs/Kconfig"
 
@@ -634,6 +629,23 @@ config FCOE_FNIC
          <file:Documentation/scsi/scsi.txt>.
          The module will be called fnic.
 
+config SCSI_SNIC
+       tristate "Cisco SNIC Driver"
+       depends on PCI && SCSI
+       help
+         This is support for the Cisco PCI-Express SCSI HBA.
+
+         To compile this driver as a module, choose M here and read
+         <file:Documentation/scsi/scsi.txt>.
+         The module will be called snic.
+
+config SCSI_SNIC_DEBUG_FS
+       bool "Cisco SNIC Driver Debugfs Support"
+       depends on SCSI_SNIC && DEBUG_FS
+       help
+         This enables to list debugging information from SNIC Driver
+         available via debugfs file system
+
 config SCSI_DMX3191D
        tristate "DMX3191D SCSI support"
        depends on PCI && SCSI
@@ -1743,7 +1755,6 @@ config SCSI_BFA_FC
 config SCSI_VIRTIO
        tristate "virtio-scsi support"
        depends on VIRTIO
-       select BLK_DEV_INTEGRITY
        help
           This is the virtual HBA driver for virtio.  If the kernel will
           be used in a virtual machine, say Y or M.