qla2x00t, regression tests: Move QLogic target code

Move the QLogic target code from drivers/scst/qla2x00-target/ to drivers/scsi/qla2xxx/. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8084 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2026-05-14 01:01:27 +00:00 · 2019-03-26 02:03:17 +00:00
parent bf9fd22294
commit 0bc77ddfd2
28 changed files with 51 additions and 138 deletions
--- a/qla2x00t/Kconfig
+++ b/qla2x00t/Kconfig
@@ -36,3 +36,34 @@ config SCSI_QLA2XXX_TARGET
 	port can be enable via sysfs interface.

 	You will also need the SCST middle level for qla2x00t.
+
+config SCST_QLA_TGT_ADDON
+	tristate "QLogic 2XXX Target Mode Add-On"
+	depends on SCST && SCSI_QLA_FC && SCSI_QLA2XXX_TARGET
+	default SCST
+	help
+	  Target mode add-on driver for QLogic 2xxx Fibre Channel host adapters.
+	  Visit http://scst.sourceforge.net for more info about this driver.
+
+config QLA_TGT_DEBUG_WORK_IN_THREAD
+	bool "Use threads context only"
+	depends on SCST_QLA_TGT_ADDON
+	help
+	  Makes SCST process incoming commands from the qla2x00t target
+	  driver and call the driver's callbacks in internal SCST
+	  threads context instead of SIRQ context, where thise commands
+	  were received. Useful for debugging and lead to some
+	  performance loss.
+
+	  If unsure, say "N".
+
+config QLA_TGT_DEBUG_SRR
+	bool "SRR debugging"
+	depends on SCST_QLA_TGT_ADDON
+	help
+	  Turns on retransmitting packets (SRR)
+	  debugging. In this mode some CTIOs will be "broken" to force the
+	  initiator to issue a retransmit request. Useful for debugging and lead to big
+	  performance loss.
+
+	  If unsure, say "N".
--- a/qla2x00t/Makefile_in-tree
+++ b/qla2x00t/Makefile_in-tree
@@ -2,3 +2,9 @@ qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o qla_nx.o

 obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
+
+ccflags-y += -Iinclude/scst -I$(src)
+
+qla2x00tgt-y := qla2x00t.o
+
+obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Kconfig
+++ b/qla2x00t/qla2x00-target/Kconfig
@@ -1,30 +0,0 @@
-config SCST_QLA_TGT_ADDON
-	tristate "QLogic 2XXX Target Mode Add-On"
-	depends on SCST && SCSI_QLA_FC && SCSI_QLA2XXX_TARGET
-	default SCST
-	help
-	  Target mode add-on driver for QLogic 2xxx Fibre Channel host adapters.
-	  Visit http://scst.sourceforge.net for more info about this driver.
-
-config QLA_TGT_DEBUG_WORK_IN_THREAD
-	bool "Use threads context only"
-	depends on SCST_QLA_TGT_ADDON
-	help
-	  Makes SCST process incoming commands from the qla2x00t target
-	  driver and call the driver's callbacks in internal SCST
-	  threads context instead of SIRQ context, where thise commands
-	  were received. Useful for debugging and lead to some
-	  performance loss.
-
-	  If unsure, say "N".
-
-config QLA_TGT_DEBUG_SRR
-	bool "SRR debugging"
-	depends on SCST_QLA_TGT_ADDON
-	help
-	  Turns on retransmitting packets (SRR)
-	  debugging. In this mode some CTIOs will be "broken" to force the
-	  initiator to issue a retransmit request. Useful for debugging and lead to big
-	  performance loss.
-
-	  If unsure, say "N".
--- a/qla2x00t/qla2x00-target/Makefile_in-tree
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree
@@ -1,5 +0,0 @@
-ccflags-y += -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.23
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.24
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.25
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.26
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.27
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.28
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.29
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.30
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.31
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.32
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.33
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.34
+++ b/qla2x00t/qla2x00-target/Makefile_in-tree-2.6.34
@@ -1,5 +0,0 @@
-ccflags-y += -Iinclude/scst -Idrivers/scsi/qla2xxx
-
-qla2x00tgt-y := qla2x00t.o
-
-obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -494,7 +494,7 @@ add_file "iscsi-scst/README_in-tree" "Documentation/scst/README.iscsi" \
 | process_patch "iscsi-scst-doc.diff"


-# Directory drivers/scst/qla2x00-target/
+# Directory drivers/scsi/qla2xxx/

 if [ "${qla2x00t}" = "true" ]; then

@@ -515,33 +515,15 @@ if [ "${qla2x00t}" = "true" ]; then
  add_file "qla2x00t/qla2x_tgt_def.h" \
           "drivers/scsi/qla2xxx/qla2x_tgt_def.h"

-  if [ -e "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" ]
-  then
-    add_file "qla2x00t/qla2x00-target/Makefile_in-tree-${kver}" \
-           "drivers/scst/qla2xxx-target/Makefile"
-  else
-    add_file "qla2x00t/qla2x00-target/Makefile_in-tree" \
-           "drivers/scst/qla2xxx-target/Makefile"
-  fi
-
-  add_file "qla2x00t/qla2x00-target/Kconfig" \
-           "drivers/scst/qla2xxx-target/Kconfig"
-
  for f in qla2x00t/qla2x00-target/*.[ch]; do
-    [ -e "$f" ] || continue
-    add_file "${f}" "drivers/scst/qla2xxx-target/${f#qla2x00t/qla2x00-target/}"
+    [ -e "$f" ] &&
+    add_file "${f}" "drivers/scsi/qla2xxx/${f#qla2x00t/qla2x00-target/}"
  done

  add_file "qla2x00t/qla2x00-target/README" \
           "Documentation/scst/README.qla2x00t" \
  | process_patch "qla2x00t-doc.diff"

-else
-
-  add_empty_file "drivers/scst/qla2xxx-target/Makefile"
-
-  add_empty_file "drivers/scst/qla2xxx-target/Kconfig"
-
 fi \
 | process_patch "qla2x00t.diff"

--- a/scst/kernel/in-tree/Makefile.scst
+++ b/scst/kernel/in-tree/Makefile.scst
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ qla2xxx-target/ \
-			srpt/ scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ fcst/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.23
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.23
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-		     	scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.24
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.24
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.25
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.25
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.26
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.26
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.27
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.27
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.28
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.28
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.29
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.29
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.30
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.30
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.31
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.31
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/
--- a/scst/kernel/in-tree/Makefile.scst-2.6.32
+++ b/scst/kernel/in-tree/Makefile.scst-2.6.32
@@ -13,5 +13,4 @@ scst-y        += scst_sysfs.o
 scst-y        += scst_targ.o
 scst-y        += scst_tg.o

-obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ qla2xxx-target/ srpt/ \
-			scst_local/
+obj-$(CONFIG_SCST)   += scst.o dev_handlers/ iscsi-scst/ srpt/ scst_local/