Commit fdf1f7ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull SCSI target updates from Nicholas Bellinger:
 "The most notable item is IBM virtual SCSI target driver, that was
  originally ported to target-core back in 2010 by Tomo-san, and has
  been brought forward to v4.x code by Bryant Ly, Michael Cyr and co
  over the last months.

  Also included are two ORDERED task related bug-fixes Bryant + Michael
  found along the way using ibmvscsis with AIX guests, plus a few
  miscellaneous target-core + iscsi-target bug-fixes with associated
  stable tags"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: fix spelling mistake: "limitiation" -> "limitation"
  target: Fix residual overflow handling in target_complete_cmd_with_length
  tcm_fc: set and unset FCP_SPPF_TARG_FCN
  iscsi-target: Fix panic when adding second TCP connection to iSCSI session
  ibmvscsis: Initial commit of IBM VSCSI Tgt Driver
  target: Fix ordered task CHECK_CONDITION early exception handling
  target: Fix ordered task target_setup_cmd_from_cdb exception hang
  target: Fix max_unmap_lba_count calc overflow
  target: Fix race between iscsi-target connection shutdown + ABORT_TASK
  target: Fix missing complete during ABORT_TASK + CMD_T_FABRIC_STOP
parents a71e3604 291e3e51

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -5831,7 +5831,15 @@ M: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> 
L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/ibmvscsi/ibmvscsi*

F:	drivers/scsi/ibmvscsi/viosrp.h

F:	include/scsi/viosrp.h



IBM Power Virtual SCSI Device Target Driver

M:	Bryant G. Ly <bryantly@linux.vnet.ibm.com>

M:	Michael Cyr <mikecyr@linux.vnet.ibm.com>

L:	linux-scsi@vger.kernel.org

L:	target-devel@vger.kernel.org

S:	Supported

F:	drivers/scsi/ibmvscsi_tgt/



IBM Power Virtual FC Device Drivers

M:	Tyrel Datwyler <tyreld@linux.vnet.ibm.com>

drivers/scsi/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -838,6 +838,23 @@ config SCSI_IBMVSCSI 
	  To compile this driver as a module, choose M here: the

	  module will be called ibmvscsi.



config SCSI_IBMVSCSIS

	tristate "IBM Virtual SCSI Server support"

	depends on PPC_PSERIES && TARGET_CORE && SCSI && PCI

	help

	  This is the IBM POWER Virtual SCSI Target Server

	  This driver uses the SRP protocol for communication betwen servers

	  guest and/or the host that run on the same server.

	  More information on VSCSI protocol can be found at www.power.org



	  The userspace configuration needed to initialize the driver can be

	  be found here:



	  https://github.com/powervm/ibmvscsis/wiki/Configuration



	  To compile this driver as a module, choose M here: the

	  module will be called ibmvscsis.



config SCSI_IBMVFC

	tristate "IBM Virtual FC support"

	depends on PPC_PSERIES && SCSI

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ obj-$(CONFIG_SCSI_SNI_53C710) += 53c700.o sni_53c710.o 
obj-$(CONFIG_SCSI_NSP32)	+= nsp32.o

obj-$(CONFIG_SCSI_IPR)		+= ipr.o

obj-$(CONFIG_SCSI_IBMVSCSI)	+= ibmvscsi/

obj-$(CONFIG_SCSI_IBMVSCSIS)	+= ibmvscsi_tgt/

obj-$(CONFIG_SCSI_IBMVFC)	+= ibmvscsi/

obj-$(CONFIG_SCSI_HPTIOP)	+= hptiop.o

obj-$(CONFIG_SCSI_STEX)		+= stex.o

drivers/scsi/ibmvscsi/ibmvfc.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include <linux/list.h>

#include <linux/types.h>

#include "viosrp.h"

#include <scsi/viosrp.h>



#define IBMVFC_NAME	"ibmvfc"

#define IBMVFC_DRIVER_VERSION		"1.0.11"

drivers/scsi/ibmvscsi/ibmvscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/list.h>

#include <linux/completion.h>

#include <linux/interrupt.h>

#include "viosrp.h"

#include <scsi/viosrp.h>



struct scsi_cmnd;

struct Scsi_Host;

CRA Git | Maintained and supported by SUSTech CRA and CCSE