[SCSI] mptfusion: Kconfig Adding new bus type drivers for fusion drivers.

(1) Kconfig - added new mptspi and mptfc scsi lld drivers
(2) Kconfig - increased MAX_SGE from 40 to 128
(2) Makefile - compilation support for split drivers
(3) Makefile - cleaned up debug defines; e.g. removed obsolete, added others

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
index 452418b..2d5a76f 100644 (file)
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
@@ -1,35 +1,50 @@
 
 menu "Fusion MPT device support"
 
-config FUSION
-       tristate "Fusion MPT (base + ScsiHost) drivers"
+config FUSION_SPI
+       tristate "Fusion MPT ScsiHost drivers for SPI"
        depends on PCI && SCSI
        ---help---
-         LSI Logic Fusion(TM) Message Passing Technology (MPT) device support
-         provides high performance SCSI host initiator, and LAN [1] interface
-         services to a host system.  The Fusion architecture is capable of
-         duplexing these protocols on high-speed Fibre Channel
-         (up to 2 GHz x 2 ports = 4 GHz) and parallel SCSI (up to Ultra-320)
-         physical medium.
+         SCSI HOST support for a parallel SCSI host adapters.
 
-         [1] LAN is not supported on parallel SCSI medium.
+         List of supported controllers:
+
+         LSI53C1020
+         LSI53C1020A
+         LSI53C1030
+         LSI53C1035
+
+config FUSION_FC
+       tristate "Fusion MPT ScsiHost drivers for FC"
+       depends on PCI && SCSI
+       ---help---
+         SCSI HOST support for a Fiber Channel host adapters.
+
+         List of supported controllers:
+
+         LSIFC909
+         LSIFC919
+         LSIFC919X
+         LSIFC929
+         LSIFC929X
+         LSIFC929XL
 
 config FUSION_MAX_SGE
        int "Maximum number of scatter gather entries"
-       depends on FUSION
-       default "40"
+       depends on FUSION_SPI || FUSION_FC
+       default "128"
        help
          This option allows you to specify the maximum number of scatter-
          gather entries per I/O. The driver defaults to 40, a reasonable number
          for most systems. However, the user may increase this up to 128.
-         Increasing this parameter will require significantly more memory 
+         Increasing this parameter will require significantly more memory
          on a per controller instance. Increasing the parameter is not
-         necessary (or recommended) unless the user will be running 
+         necessary (or recommended) unless the user will be running
          large I/O's via the raw interface.
 
 config FUSION_CTL
        tristate "Fusion MPT misc device (ioctl) driver"
-       depends on FUSION
+       depends on FUSION_SPI || FUSION_FC
        ---help---
          The Fusion MPT misc device driver provides specialized control
          of MPT adapters via system ioctl calls.  Use of ioctl calls to
@@ -48,7 +63,7 @@ config FUSION_CTL
 
 config FUSION_LAN
        tristate "Fusion MPT LAN driver"
-       depends on FUSION && NET_FC
+       depends on FUSION_FC && NET_FC
        ---help---
          This module supports LAN IP traffic over Fibre Channel port(s)
          on Fusion MPT compatible hardware (LSIFC9xx chips).

diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index f6fdcaa..1c99e35 100644 (file)
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -1,52 +1,38 @@
-#
-# Makefile for the LSI Logic Fusion MPT (Message Passing Technology) drivers.
-#
-# Note! If you want to turn on various debug defines for an extended period of
-# time but don't want them lingering around in the Makefile when you pass it on
-# to someone else, use the MPT_CFLAGS env variable (thanks Steve). -nromer
-
-#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-{ LSI_LOGIC
-
-#  Architecture-specific...
-#                      # intel
-#EXTRA_CFLAGS += -g
-#                      # sparc64
-#EXTRA_CFLAGS += -gstabs+
-
-EXTRA_CFLAGS += ${MPT_CFLAGS}
-
 # Fusion MPT drivers; recognized debug defines...
 #  MPT general:
-#EXTRA_CFLAGS += -DMPT_DEBUG_SCSI
 #EXTRA_CFLAGS += -DMPT_DEBUG
 #EXTRA_CFLAGS += -DMPT_DEBUG_MSG_FRAME
 #EXTRA_CFLAGS += -DMPT_DEBUG_SG
+#EXTRA_CFLAGS += -DMPT_DEBUG_EVENTS
+#EXTRA_CFLAGS += -DMPT_DEBUG_INIT
+#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT
+#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL
+
 
 #
 # driver/module specifics...
 #
 #  For mptbase:
 #CFLAGS_mptbase.o += -DMPT_DEBUG_HANDSHAKE
+#CFLAGS_mptbase.o += -DMPT_DEBUG_CONFIG
+#CFLAGS_mptbase.o += -DMPT_DEBUG_DL
 #CFLAGS_mptbase.o += -DMPT_DEBUG_IRQ
+#CFLAGS_mptbase.o += -DMPT_DEBUG_RESET
 #
 #  For mptscsih:
-#CFLAGS_mptscsih.o += -DMPT_DEBUG_SCANDV
-#CFLAGS_mptscsih.o += -DMPT_DEBUG_RESET
-#CFLAGS_mptscsih.o += -DMPT_DEBUG_NEH
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_DV
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_NEGO
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_TM
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_SCSI
+#CFLAGS_mptscsih.o += -DMPT_DEBUG_REPLY
 #
 #  For mptctl:
 #CFLAGS_mptctl.o += -DMPT_DEBUG_IOCTL
 #
-#  For mptlan:
-#CFLAGS_mptlan.o += -DMPT_LAN_IO_DEBUG
-#
-#  For isense:
-
-#  EXP...
-##mptscsih-objs        := scsihost.o scsiherr.o
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
 
-obj-$(CONFIG_FUSION)           += mptbase.o mptscsih.o
+obj-$(CONFIG_FUSION_SPI)       += mptspi.o mptscsih.o mptbase.o
+obj-$(CONFIG_FUSION_FC)                += mptfc.o mptscsih.o mptbase.o
 obj-$(CONFIG_FUSION_CTL)       += mptctl.o
 obj-$(CONFIG_FUSION_LAN)       += mptlan.o