Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Target port #14

Merged
merged 2 commits into from
May 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -5360,6 +5360,14 @@ S: Supported
F: drivers/scsi/ibmvscsi/ibmvscsi*
F: drivers/scsi/ibmvscsi/viosrp.h

IBM Power Virtual SCSI Device Target Driver
M: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
L: linux-scsi@vger.kernel.org
L: target-devel@vger.kernel.org
S: Supported
F: drivers/scsi/ibmvscsi/ibmvscsis.*
F: drivers/scsi/libsrp.*

IBM Power Virtual FC Device Drivers
M: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
L: linux-scsi@vger.kernel.org
Expand Down
51 changes: 15 additions & 36 deletions drivers/scsi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ config SCSI_DMA
bool
default n

config SCSI_TGT
tristate "SCSI target support"
depends on SCSI
---help---
If you want to use SCSI target mode drivers enable this option.
If you choose M, the module will be called scsi_tgt.

config SCSI_NETLINK
bool
default n
Expand Down Expand Up @@ -275,13 +268,6 @@ config SCSI_FC_ATTRS
each attached FiberChannel device to sysfs, say Y.
Otherwise, say N.

config SCSI_FC_TGT_ATTRS
bool "SCSI target support for FiberChannel Transport Attributes"
depends on SCSI_FC_ATTRS
depends on SCSI_TGT = y || SCSI_TGT = SCSI_FC_ATTRS
help
If you want to use SCSI target mode drivers enable this option.

config SCSI_ISCSI_ATTRS
tristate "iSCSI Transport Attributes"
depends on SCSI && NET
Expand All @@ -308,12 +294,6 @@ config SCSI_SRP_ATTRS
If you wish to export transport-specific information about
each attached SRP device to sysfs, say Y.

config SCSI_SRP_TGT_ATTRS
bool "SCSI target support for SRP Transport Attributes"
depends on SCSI_SRP_ATTRS
depends on SCSI_TGT = y || SCSI_TGT = SCSI_SRP_ATTRS
help
If you want to use SCSI target mode drivers enable this option.
endmenu

menuconfig SCSI_LOWLEVEL
Expand Down Expand Up @@ -868,18 +848,18 @@ config SCSI_IBMVSCSI
module will be called ibmvscsi.

config SCSI_IBMVSCSIS
tristate "IBM Virtual SCSI Server support"
depends on PPC_PSERIES && SCSI_SRP && SCSI_SRP_TGT_ATTRS && TARGET_CORE
help
This is the SRP target driver for IBM pSeries virtual environments.
tristate "IBM Virtual SCSI Server support"
depends on PPC_PSERIES && SCSI_SRP && TARGET_CORE
help
This is the SRP target driver for IBM pSeries virtual environments.

The userspace component needed to initialize the driver and
documentation can be found:
The userspace component needed to initialize the driver and
documentation can be found:

http://stgt.berlios.de/
http://stgt.berlios.de/

To compile this driver as a module, choose M here: the
module will be called ibmvstgt.
To compile this driver as a module, choose M here: the
module will be called ibmvstgt.

config SCSI_IBMVFC
tristate "IBM Virtual FC support"
Expand Down Expand Up @@ -1763,14 +1743,13 @@ config SCSI_PM8001
based host adapters.

config SCSI_SRP
tristate "SCSI RDMA Protocol helper library"
depends on SCSI && PCI
select SCSI_TGT
help
If you wish to use SRP target drivers, say Y.
tristate "SCSI RDMA Protocol helper library"
depends on SCSI && PCI
help
If you wish to use SRP target drivers, say Y.

To compile this driver as a module, choose M here: the
module will be called libsrp.
To compile this driver as a module, choose M here: the
module will be called libsrp.

config SCSI_BFA_FC
tristate "Brocade BFA Fibre Channel Support"
Expand Down
5 changes: 2 additions & 3 deletions drivers/scsi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
obj-$(CONFIG_PCMCIA) += pcmcia/

obj-$(CONFIG_SCSI) += scsi_mod.o
obj-$(CONFIG_SCSI_TGT) += scsi_tgt.o

obj-$(CONFIG_RAID_ATTRS) += raid_class.o

Expand Down Expand Up @@ -149,6 +148,8 @@ obj-$(CONFIG_XEN_SCSI_FRONTEND) += xen-scsifront.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_SCSI_WD719X) += wd719x.o

CFLAGS_libsrp.o := -DDEBUG

obj-$(CONFIG_ARM) += arm/

obj-$(CONFIG_CHR_DEV_ST) += st.o
Expand Down Expand Up @@ -179,8 +180,6 @@ scsi_mod-$(CONFIG_SCSI_DH) += scsi_dh.o

hv_storvsc-y := storvsc_drv.o

scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o

sd_mod-objs := sd.o
sd_mod-$(CONFIG_BLK_DEV_INTEGRITY) += sd_dif.o

Expand Down
Loading