diff options
author | imp <imp@FreeBSD.org> | 2010-03-04 20:41:11 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2010-03-04 20:41:11 +0000 |
commit | 3860a058155dbee2de632be4f7d91488b158b560 (patch) | |
tree | 3e57f9dc436c953d41d344da6f45893cb80193e5 /share | |
parent | f10014d6dd6f036cce246e32dab512da24383ce8 (diff) | |
download | FreeBSD-src-3860a058155dbee2de632be4f7d91488b158b560.zip FreeBSD-src-3860a058155dbee2de632be4f7d91488b158b560.tar.gz |
Merge through 204723 plus changes to usr.sbin to move to the Makefile.arch setup
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man4/ada.4 | 1 | ||||
-rw-r--r-- | share/man/man4/ahci.4 | 4 | ||||
-rw-r--r-- | share/man/man4/cd.4 | 2 | ||||
-rw-r--r-- | share/man/man4/ch.4 | 1 | ||||
-rw-r--r-- | share/man/man4/da.4 | 1 | ||||
-rw-r--r-- | share/man/man4/pass.4 | 1 | ||||
-rw-r--r-- | share/man/man4/pt.4 | 2 | ||||
-rw-r--r-- | share/man/man4/sa.4 | 4 | ||||
-rw-r--r-- | share/man/man4/scsi.4 | 79 | ||||
-rw-r--r-- | share/man/man4/siis.4 | 4 |
10 files changed, 63 insertions, 36 deletions
diff --git a/share/man/man4/ada.4 b/share/man/man4/ada.4 index 65cd53f..cba892b 100644 --- a/share/man/man4/ada.4 +++ b/share/man/man4/ada.4 @@ -127,6 +127,7 @@ ATA device nodes .Sh SEE ALSO .Xr ad 4 , .Xr ahci 4 , +.Xr cam 4 , .Xr da 4 , .Xr siis 4 .Sh HISTORY diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4 index 675bab6..e279963 100644 --- a/share/man/man4/ahci.4 +++ b/share/man/man4/ahci.4 @@ -139,10 +139,10 @@ such as JMicron JMB36x and Marvell 88SX61xx. .Sh SEE ALSO .Xr ada 4 , .Xr ata 4 , +.Xr cam 4 , .Xr cd 4 , .Xr da 4 , -.Xr sa 4 , -.Xr scsi 4 +.Xr sa 4 .Sh HISTORY The .Nm diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4 index ec16751..ed88535 100644 --- a/share/man/man4/cd.4 +++ b/share/man/man4/cd.4 @@ -496,8 +496,8 @@ devices .Sh DIAGNOSTICS None. .Sh SEE ALSO +.Xr cam 4 , .Xr da 4 , -.Xr scsi 4 , .Xr disklabel 5 , .Xr disklabel 8 , .Xr cd 9 diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4 index 03e293a..6bd2df4 100644 --- a/share/man/man4/ch.4 +++ b/share/man/man4/ch.4 @@ -325,6 +325,7 @@ If the media changer does not support features requested by the driver, it will produce both console error messages and failure return codes to the ioctls described here. .Sh SEE ALSO +.Xr cam 4 , .Xr chio 1 , .Xr cd 4 , .Xr da 4 , diff --git a/share/man/man4/da.4 b/share/man/man4/da.4 index 2ba8096..cf56934 100644 --- a/share/man/man4/da.4 +++ b/share/man/man4/da.4 @@ -196,6 +196,7 @@ SCSI disk device nodes None. .Sh SEE ALSO .Xr ad 4 , +.Xr cam 4 , .Xr geom 4 , .Xr bsdlabel 8 , .Xr fdisk 8 diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4 index b96d6ba..7819ea3 100644 --- a/share/man/man4/pass.4 +++ b/share/man/man4/pass.4 @@ -104,6 +104,7 @@ CAM subsystem. None. .Sh SEE ALSO .Xr cam 3 , +.Xr cam 4 , .Xr cam_cdbparse 3 , .Xr xpt 4 , .Xr camcontrol 8 diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4 index 170956e..b45ae5a 100644 --- a/share/man/man4/pt.4 +++ b/share/man/man4/pt.4 @@ -84,7 +84,7 @@ the .Ar N Ns th processor device. .El .Sh SEE ALSO -.Xr scsi 4 +.Xr cam 4 .Sh HISTORY The .Nm diff --git a/share/man/man4/sa.4 b/share/man/man4/sa.4 index 0a6da7c..eae3bf5 100644 --- a/share/man/man4/sa.4 +++ b/share/man/man4/sa.4 @@ -200,8 +200,8 @@ accessing the device, e.g.). .Sh DIAGNOSTICS None. .Sh SEE ALSO -.Xr mt 1 , -.Xr scsi 4 +.Xr cam 4 , +.Xr mt 1 .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index fccb935..ad52663 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -24,15 +24,15 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd October 15, 1998 -.Dt SCSI 4 +.Dd March 4, 2010 +.Dt CAM 4 .Os .Sh NAME -.Nm SCSI , .Nm CAM -.Nd CAM SCSI subsystem +.Nd Common Access Method SCSI/ATA subsystem .Sh SYNOPSIS .Cd "device scbus" +.Cd "device ada" .Cd "device cd" .Cd "device ch" .Cd "device da" @@ -49,31 +49,32 @@ .Cd "options SCSI_NO_OP_STRINGS" .Cd "options SCSI_DELAY=8000" .Sh DESCRIPTION -The CAM -.Tn SCSI +The +.Nm subsystem provides a uniform and modular system for the implementation of drivers to control various .Tn SCSI +and +.Tn ATA devices, and to utilize different .Tn SCSI +and +.Tn ATA host adapters through host adapter drivers. -When the system probes the -.Tn SCSI -busses, it attaches any devices it finds to the appropriate -drivers. +When the system probes busses, it attaches any devices it finds to the +appropriate drivers. The .Xr pass 4 -driver, if it is configured in the kernel, will attach to all -.Tn SCSI -devices. +driver, if it is configured in the kernel, will attach to all devices. .Sh KERNEL CONFIGURATION There are a number of generic kernel configuration options for the -CAM -.Tn SCSI +.Nm subsystem: .Bl -tag -width SCSI_NO_SENSE_STRINGS .It Dv CAMDEBUG -This option enables the CAM debugging printf code. +This option enables the +.Nm +debugging printf code. This will not actually cause any debugging information to be printed out when included by itself. Enabling printouts requires additional configuration. @@ -82,12 +83,11 @@ See below for details. This sets the maximum allowable number of concurrent "high power" commands. A "high power" command is a command that takes more electrical power than most to complete. -An example of this (and the only command currently -tagged as "high power") is the +An example of this is the .Tn SCSI START UNIT command. -Starting a SCSI disk often takes significantly more -electrical power than normal operation of the disk. +Starting a disk often takes significantly more electrical power than normal +operation. This option allows the user to specify how many concurrent high power commands may be outstanding without overloading the power supply on his computer. @@ -120,7 +120,9 @@ problems. This is the .Tn SCSI "bus settle delay." -In CAM, it is specified in +In +.Nm , +it is specified in .Em milliseconds , not seconds like the old .Tn SCSI @@ -148,7 +150,7 @@ In that case, the will be reset to 100ms. .El .Pp -All devices and the SCSI busses support boot time allocation so that +All devices and busses support dynamic allocation so that an upper number of devices and controllers does not need to be configured; .Cd "device da" will suffice for any number of disk drivers. @@ -204,7 +206,9 @@ hint.da.0.unit="0" This assigns .Em da0 to target 0, unit (lun) 0 of scbus 0. -Omitting the target or unit hints will instruct CAM to treat them as wildcards +Omitting the target or unit hints will instruct +.Nm +to treat them as wildcards and use the first respective counted instances. These examples can be combined together to allow a peripheral device to be wired to any particular controller, bus, target, and/or unit instance. @@ -221,7 +225,9 @@ The system allows common device drivers to work through many different types of adapters. The adapters take requests from the upper layers and do all IO between the -.Em SCSI +.Tn SCSI +or +.Tn ATA bus and the system. The maximum size of a transfer is governed by the adapter. @@ -233,7 +239,8 @@ Some adapters support in which the system is capable of operating as a device, responding to operations initiated by another system. Target mode is supported for -some adapters, but is not yet complete for this version of the CAM +some adapters, but is not yet complete for this version of the +.Nm .Tn SCSI subsystem. .Sh FILES @@ -278,7 +285,9 @@ Users can enable debugging from their kernel config file, by using the following kernel config options: .Bl -tag -width CAM_DEBUG_TARGET .It Dv CAMDEBUG -This enables CAM debugging. +This enables +.Nm +debugging. Without this option, users will not even be able to turn on debugging from userland via .Xr camcontrol 8 . @@ -313,9 +322,12 @@ See .Xr camcontrol 8 for details. .Sh SEE ALSO +.Xr ada 4 , .Xr aha 4 , .Xr ahb 4 , .Xr ahc 4 , +.Xr ahci 4 , +.Xr ata 4 , .Xr bt 4 , .Xr cd 4 , .Xr ch 4 , @@ -326,15 +338,26 @@ for details. .Xr xpt 4 , .Xr camcontrol 8 .Sh HISTORY -The CAM +The +.Nm .Tn SCSI subsystem first appeared in .Fx 3.0 . +The +.Nm +ATA support was added in +.Fx 8.0 . .Sh AUTHORS .An -nosplit -The CAM +The +.Nm .Tn SCSI subsystem was written by .An Justin Gibbs and .An Kenneth Merry . +The +.Nm +.Tn ATA +support was added by +.An Alexander Motin Aq mav@FreeBSD.org . diff --git a/share/man/man4/siis.4 b/share/man/man4/siis.4 index 8f70839..7480f70 100644 --- a/share/man/man4/siis.4 +++ b/share/man/man4/siis.4 @@ -113,10 +113,10 @@ SiI3531 .Sh SEE ALSO .Xr ada 4 , .Xr ata 4 , +.Xr cam 4 , .Xr cd 4 , .Xr da 4 , -.Xr sa 4 , -.Xr scsi 4 +.Xr sa 4 .Sh HISTORY The .Nm |