Merge remote-tracking branch 'origin/stable/10' into devel

1 files changed, 51 insertions, 75 deletions

diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index 23fd4b1..71050a2 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -1,7 +1,6 @@
-.\"     $NetBSD: isp.4,v 1.5 1999/12/18 18:33:05 mjacob Exp $
-.\"
-.\" Copyright (c) 1998, 1999, 2001
-.\"     Matthew Jacob, for NASA/Ames Research Center
+.\" Copyright (c) 2009-2015 Alexander Motin <mav@FreeBSD.org>
+.\" Copyright (c) 2006 Marcus Alves Grando
+.\" Copyright (c) 1998-2001 Matthew Jacob, for NASA/Ames Research Center
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -25,16 +24,14 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" Additional Copyright (c) 2006 by Marcus Alves Grando
-.\"
 .\" $FreeBSD$
 .\"
-.Dd February 28, 2007
+.Dd November 22, 2015
 .Dt ISP 4
 .Os
 .Sh NAME
 .Nm isp
-.Nd Qlogic based SCSI and FibreChannel SCSI Host Adapters
+.Nd Qlogic based SPI and FibreChannel SCSI Host Adapters
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -52,42 +49,24 @@ isp_load="YES"
 .Ed
 .Sh DESCRIPTION
 This driver provides access to
-.Tn SCSI
+.Tn SPI
 or
 .Tn FibreChannel
-devices.
+SCSI devices.
 .Pp
-SCSI features include support for Ultra SCSI and wide mode transactions
-for
+SPI supports initiator mode for Ultra SCSI and wide mode transactions for
 .Tn SCSI ,
-Ultra2 LVD (for the ISP1080 and ISP1280), and Ultra3 LVD (for the
-ISP12160).
+Ultra2 LVD (1080, 1280), and Ultra3 LVD (10160, 12160).
 .Pp
-Fibre Channel support uses FCP SCSI profile for
-.Tn FibreChannel ,
-and utilizes Class 3 and Class 2 connections (Qlogic 2100 is Class
-3 only, minor patches to the Qlogic 2200 to force Class 2 mode).
-Support is available for Public and Private loops, and for
-point-to-point connections (Qlogic 2200 only).
-The newer 2-Gigabit cards (2300, 2312, 2322) and 4-Gigabit (2422, 2432)
-are also supported.
-Command tagging is
-supported for all (in fact,
-.Tn FibreChannel
-requires tagging).
-Fabric support is enabled by default for other than 2100 cards.
-Fabric
-support for 2100 cards has been so problematic and these cards are so
-old now that it is just not worth your time to try it.
+Fibre Channel supports initiator and target modes of FCP SCSI profile,
+utilizing Class 3 and Class 2 (2200 and later) connections.
+Support is available for Public and Private loops, Point-to-Point
+and Fabric connections.
 .Sh FIRMWARE
-Firmware is available if the
+Firmware loading is supported if the
 .Xr ispfw 4
-module is loaded during bootstrap (q.v.).
-.Pp
-It is
-.Ar strongly
-recommended that you use the firmware available
-from
+module is loaded.
+It is strongly recommended that you use the firmware available from
 .Xr ispfw 4
 as it is the most likely to have been tested with this driver.
 .Sh HARDWARE
@@ -95,50 +74,46 @@ Cards supported by the
 .Nm
 driver include:
 .Bl -tag -width xxxxxx -offset indent
-.It ISP1000
-SBus Fast Wide, Ultra Fast Wide cards, Single Ended or Differential
-cards.
-.It ISP1020
-Qlogic 1020 Fast Wide and Differential Fast Wide PCI cards.
-.It ISP1040
-Qlogic 1040 Ultra Wide and Differential Ultra Wide PCI cards.
-Also known as the DEC KZPBA-CA (single ended) and KZPBA-CB (HVD differential).
-.It Qlogic 1240
-Qlogic 1240 Dual Bus Ultra Wide and Differential Ultra Wide PCI
-cards.
+.It Qlogic 1000
+Fast Wide, Ultra Fast Wide cards, Single Ended or Differential SBus cards.
 .It Qlogic 1020
-Qlogic 1020 SCSI cards.
+Fast Wide and Differential Fast Wide SCSI PCI cards.
 .It Qlogic 1040
-Qlogic 1040 Ultra SCSI cards.
+Ultra Wide and Differential Ultra Wide SCSI PCI cards.
+Also known as the DEC KZPBA-CA (single ended) and KZPBA-CB (HVD differential).
 .It Qlogic 1080
-Qlogic 1280 LVD Ultra2 Wide PCI cards.
+LVD Ultra2 Wide SCSI PCI cards.
+.It Qlogic 10160
+LVD Ultra3 Wide SCSI PCI cards.
+.It Qlogic 1240
+Dual Bus Ultra Wide and Differential Ultra Wide SCSI PCI cards.
 .It Qlogic 1280
-Qlogic 1280 Dual Bus LVD Ultra2 Wide PCI cards.
+Dual Bus LVD Ultra2 Wide SCSI PCI cards.
 .It Qlogic 12160
-Qlogic 12160 Dual Bus LVD Ultra3 Wide PCI cards.
+Dual Bus LVD Ultra3 Wide SCSI PCI cards.
 .It Qlogic 210X
-Qlogic 2100 and 2100A Copper and Optical Fibre Channel Arbitrated
-Loop (single, dual).
+Copper and Optical Fibre Channel Arbitrated Loop PCI cards (single, dual).
 .It Qlogic 220X
-Qlogic 2200 Copper and Optical Fibre Channel Arbitrated Loop PCI
-cards (single, dual, quad).
+Copper and Optical Fibre Channel Arbitrated Loop PCI cards (single, dual, quad).
 .It Qlogic 2300
-Qlogic 2300 Optical Fibre Channel PCI cards.
+Optical 2Gb Fibre Channel PCI cards.
 .It Qlogic 2312
-Qlogic 2312 Optical Fibre Channel PCI cards.
+Optical 2Gb Fibre Channel PCI cards.
 .It Qlogic 234X
-Qlogic 234X Optical Fibre Channel PCI cards (2312 chipset, single and dual attach).
+Optical 2Gb Fibre Channel PCI cards (2312 chipset, single and dual attach).
 .It Qlogic 2322
-Qlogic 2322 Optical Fibre Channel PCIe cards.
+Optical 2Gb Fibre Channel PCIe cards.
 .It Qlogic 200
-Dell Branded version of the QLogic 2312 Fibre Channel PCI cards.
+Dell branded version of the QLogic 2312.
 .It Qlogic 2422
-Qlogic 2422 Optical Fibre Channel PCI cards (4 Gigabit)
+Optical 4Gb Fibre Channel PCI cards.
 .It Qlogic 2432
-Qlogic 2432 Optical Fibre Channel PCIe cards (4 Gigabit)
+Optical 4Gb Fibre Channel PCIe cards.
+.It Qlogic 2532
+Optical 8Gb Fibre Channel PCIe cards.
 .El
 .Sh CONFIGURATION OPTIONS
-Target mode support may be enabled with the
+Target mode support for Fibre Channel adapters may be enabled with the
 .Pp
 .Cd options ISP_TARGET_MODE
 .Pp
@@ -149,8 +124,6 @@ The following options are switchable by setting values in
 .Pp
 They are:
 .Bl -tag -width indent
-.It Va hint.isp.0.disable
-A hint value to disable driver in kernel.
 .It Va hint.isp.0.fwload_disable
 A hint value to disable loading of firmware
 .Xr ispfw 4 .
@@ -192,11 +165,14 @@ cards in Local Loop topologies it is
 .Ar strongly
 recommended that you set this value to non-zero.
 .It Va hint.isp.0.role
-A hint to define default role for isp instance (target, initiator, both).
+A hint to define default role for isp instance (0 -- none, 1 -- target,
+2 -- initiator, 3 -- both).
 .It Va hint.isp.0.debug
 A hint value for a driver debug level (see the file
 .Pa /usr/src/sys/dev/isp/ispvar.h
 for the values.
+.It Va hint.isp.0.vports
+A hint to create specified number of additional virtual ports.
 .El
 .Sh SYSCTL OPTIONS
 .Bl -tag -width indent
@@ -226,13 +202,13 @@ This is the readonly World Wide Port Name value for this port.
 .Sh AUTHORS
 The
 .Nm
-driver was written by Matthew Jacob originally for NetBSD at
-NASA/Ames Research Center.
+driver was written by
+.An Matthew Jacob
+originally for NetBSD at NASA/Ames Research Center.
+Some later improvement was done by
+.An Alexander Motin Aq Mt mav@FreeBSD.org .
 .Sh BUGS
 The driver currently ignores some NVRAM settings.
 .Pp
-Target mode support is not completely reliable yet.
-It works reasonably
-well for Fibre Channel, somewhat well for Qlogic 1040 cards, but
-does not yet work for the other cards (due to last minute unannounced
-changes in firmware interfaces).
+Fabric support for 2100 cards has been so problematic, and these cards are so
+old now that it is just not worth your time to try it.