From 7efec73e6977f03c831f7c3c0a7080b8de0e2c38 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 22 Feb 2017 21:10:00 +0100 Subject: [PATCH] Clean up a bit after the recent ahc/ahd/aic removal. --- Makefile_upgrade.inc | 7 + UPDATING | 9 +- etc/devd.conf | 4 +- lib/libcam/cam.3 | 2 +- share/man/man4/Makefile | 3 - share/man/man4/adv.4 | 1 - share/man/man4/ahc.4 | 444 ------------------------- share/man/man4/ahd.4 | 184 ---------- share/man/man4/aic.4 | 52 --- share/man/man4/scsi.4 | 16 +- share/man/man4/targ.4 | 9 +- sys/sys/camlib.h | 3 +- tools/tools/kerninclude/kerninclude.sh | 1 - tools/tools/kernxref/kernxref.sh | 2 +- 14 files changed, 26 insertions(+), 711 deletions(-) delete mode 100644 share/man/man4/ahc.4 delete mode 100644 share/man/man4/ahd.4 delete mode 100644 share/man/man4/aic.4 diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index d8f3706cb5..f9a8aa182f 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -3201,6 +3201,13 @@ TO_REMOVE+=/etc/rc.d/abi TO_REMOVE+=/sbin/mount_linprocfs TO_REMOVE+=/usr/share/man/man5/linprocfs.5.gz TO_REMOVE+=/usr/share/man/man8/mount_linprocfs.8.gz +TO_REMOVE+=/boot/kernel/ahc.ko +TO_REMOVE+=/boot/kernel/ahc_pci.ko +TO_REMOVE+=/boot/kernel/ahd.ko +TO_REMOVE+=/boot/kernel/aic.ko +TO_REMOVE+=/usr/share/man/man4/ahc.4.gz +TO_REMOVE+=/usr/share/man/man4/ahd.4.gz +TO_REMOVE+=/usr/share/man/man4/aic.4.gz .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/UPDATING b/UPDATING index abbbabf51c..f284e2a748 100644 --- a/UPDATING +++ b/UPDATING @@ -12,11 +12,12 @@ + UPGRADING DRAGONFLY FROM 4.6 TO LATER VERSIONS + +-----------------------------------------------------------------------+ -NCV, NSP AND STG DRIVERS REMOVED --------------------------------- +AHC, AHD, AIC, NCV, NSP AND STG DRIVERS REMOVED +----------------------------------------------- -They were all in our X86_64_GENERIC kernel configuration file, so any -custom configuration files derived from it need adjustment. +They were all in our X86_64_GENERIC kernel configuration file, along with +the AHC_REG_PRETTY_PRINT and AHD_REG_PRETTY_PRINT options, so any custom +configuration files derived from it need adjustment. PORTAL FILE SYSTEM REMOVED -------------------------- diff --git a/etc/devd.conf b/etc/devd.conf index da4fa7c9a8..d964a8d862 100644 --- a/etc/devd.conf +++ b/etc/devd.conf @@ -19,8 +19,8 @@ options { # Setup some shorthand for regex that we use later in the file. #XXX Yes, these are gross -- imp set scsi-controller-regex - "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ - esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|sym|trm|wds)\ + "(aac|adv|adw|amd|amr|asr|bt|ciss|dpt|\ + ida|iir|ips|isp|mlx|mly|mpt|ncr|sym|trm)\ [0-9]+"; }; diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3 index a266941baf..2c9c90484e 100644 --- a/lib/libcam/cam.3 +++ b/lib/libcam/cam.3 @@ -157,7 +157,7 @@ struct cam_device { */ char sim_name[SIM_IDLEN+1];/* - * Controller name, e.g.'ahc' + * Controller name, e.g.'ahci' */ u_int32_t sim_unit_number; /* Controller unit number */ u_int32_t bus_id; /* Controller bus number */ diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 1e18b7799f..aef63bf17c 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -21,11 +21,8 @@ MAN= aac.4 \ aesni.4 \ age.4 \ agp.4 \ - ahc.4 \ ahci.4 \ - ahd.4 \ aibs.4 \ - aic.4 \ alc.4 \ ale.4 \ alpm.4 \ diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4 index 8c50c2c0cb..ccebbe2483 100644 --- a/share/man/man4/adv.4 +++ b/share/man/man4/adv.4 @@ -110,7 +110,6 @@ the maximum number of tags a device can receive as well as guarantee fair resource allocation among devices. .Sh SEE ALSO .Xr adw 4 , -.Xr ahc 4 , .Xr cd 4 , .Xr da 4 , .Xr sa 4 , diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 deleted file mode 100644 index 8a41840481..0000000000 --- a/share/man/man4/ahc.4 +++ /dev/null @@ -1,444 +0,0 @@ -.\" -.\" Copyright (c) 1995, 1996, 1997, 1998, 2000 -.\" Justin T. Gibbs. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" $FreeBSD: src/share/man/man4/ahc.4,v 1.38.2.1 2006/06/05 19:30:28 brueffer Exp $ -.\" -.Dd September 26, 2007 -.Dt AHC 4 -.Os -.Sh NAME -.Nm ahc -.Nd Adaptec PCI SCSI host adapter driver -.Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device scbus" -.Cd "device ahc" -.Cd "device pci" -.Pp -To allow PCI adapters to use memory mapped I/O if enabled: -.Cd options AHC_ALLOW_MEMIO -.Pp -To compile in debugging code: -.Cd options AHC_DEBUG -.Cd options AHC_DEBUG_OPTS= -.Cd options AHC_REG_PRETTY_PRINT -.Pp -To configure one or more controllers to assume the target role: -.Cd options AHC_TMODE_ENABLE -.Ed -.Pp -Alternatively, to load the driver as a -module at boot time, place the following lines in -.Xr loader.conf 5 : -.Bd -literal -offset indent -ahc_load="YES" -ahc_pci_load="YES" -.Ed -.Sh DESCRIPTION -This driver provides access to the -.Tn SCSI -bus(es) connected to the Adaptec AIC77xx and AIC78xx -host adapter chips. -.Pp -Driver features include support for twin and wide busses, -fast, ultra or ultra2 synchronous transfers depending on controller type, -tagged queueing, SCB paging, and target mode. -.Pp -Memory mapped I/O can be enabled for PCI devices with the -.Dq Dv AHC_ALLOW_MEMIO -configuration option. -Memory mapped I/O is more efficient than the alternative, programmed I/O. -Most PCI BIOSes will map devices so that either technique for communicating -with the card is available. -In some cases, -usually when the PCI device is sitting behind a PCI->PCI bridge, -the BIOS may fail to properly initialize the chip for memory mapped I/O. -The typical symptom of this problem is a system hang if memory mapped I/O -is attempted. -Most modern motherboards perform the initialization correctly and work fine -with this option enabled. -.Pp -The -.Dv AHC_DEBUG_OPTS -option is used to control which diagnostic messages are printed to the -console when -.Dv AHC_DEBUG -is enabled. -Logically OR the following bits together: -.Bl -column -offset indent ".Em Value" ".Em Function" -.It Em Value Ta Em Function -.It 0x0001 Ta Show miscellaneous information -.It 0x0002 Ta Show sense data -.It 0x0004 Ta Show Serial EEPROM contents -.It 0x0008 Ta Show bus termination settings -.It 0x0010 Ta Show host memory usage -.It 0x0020 Ta Show SCSI protocol messages -.\".It 0x0040 XXX: AHC_SHOW_DV -.It 0x0080 Ta Show selection timeouts -.It 0x0200 Ta Show Queue Full status -.It 0x0400 Ta Show SCB queue status -.It 0x0800 Ta Show inbound packet information -.\".It 0x1000 XXX: AHC_SHOW_MASKED_ERRORS -.It 0x2000 Ta Enable extra diagnostic code in the firmware -.El -.Pp -The -.Dv AHC_REG_PRETTY_PRINT -option compiles in support for human-readable bit definitions for each register -that is printed by the debugging code. -.Pp -Individual controllers may be configured to operate in the target role -through the -.Dq Dv AHC_TMODE_ENABLE -configuration option. -The value assigned to this option should be a bitmap -of all units where target mode is desired. -For example, a value of 0x25, would enable target mode on units 0, 2, and 5. -A value of 0x8a enables it for units 1, 3, and 7. -.Pp -Per target configuration performed in the -.Tn SCSI-Select -menu, accessible at boot, is honored by this driver. -This includes synchronous/asynchronous transfers, -maximum synchronous negotiation rate, -wide transfers, -disconnection -and the host adapter's SCSI ID. -For systems that store non-volatile settings in a system specific manner -rather than a serial eeprom directly connected to the aic7xxx controller, -the -.Tn BIOS -must be enabled for the driver to access this information. -This restriction applies to many motherboard configurations. -.Pp -Note that I/O addresses are determined automatically by the probe routines. -.Pp -Performance and feature sets vary throughout the aic7xxx product line. -The following table provides a comparison of the different chips supported -by the -.Nm -driver. -Note that wide and twin channel features, although always supported -by a particular chip, may be disabled in a particular motherboard or card -design. -.Bd -ragged -compact -.Bl -column "aic7850 " "MIPS " "PCI/32 " "MaxSync " "MaxWidth " "SCBs " "1 2 3 4 5 6 7 8 " -.It Em Chip Ta Em MIPS Ta Em Bus Ta Em MaxSync Ta Em MaxWidth Ta Em SCBs Ta Em Features -.It aic7850 Ta 10 Ta PCI/32 Ta 10MHz Ta 8Bit Ta 3 Ta "" -.It aic7860 Ta 10 Ta PCI/32 Ta 20MHz Ta 8Bit Ta 3 Ta "" -.It aic7870 Ta 10 Ta PCI/32 Ta 10MHz Ta 16Bit Ta 16 Ta "" -.It aic7880 Ta 10 Ta PCI/32 Ta 20MHz Ta 16Bit Ta 16 Ta "" -.It aic7890 Ta 20 Ta PCI/32 Ta 40MHz Ta 16Bit Ta 16 Ta " 3 4 5 6 7 8" -.It aic7891 Ta 20 Ta PCI/64 Ta 40MHz Ta 16Bit Ta 16 Ta " 3 4 5 6 7 8" -.It aic7892 Ta 20 Ta PCI/64 Ta 80MHz Ta 16Bit Ta 16 Ta " 3 4 5 6 7 8" -.It aic7895 Ta 15 Ta PCI/32 Ta 20MHz Ta 16Bit Ta 16 Ta " 2 3 4 5" -.It aic7895C Ta 15 Ta PCI/32 Ta 20MHz Ta 16Bit Ta 16 Ta " 2 3 4 5 8" -.It aic7896 Ta 20 Ta PCI/32 Ta 40MHz Ta 16Bit Ta 16 Ta " 2 3 4 5 6 7 8" -.It aic7897 Ta 20 Ta PCI/64 Ta 40MHz Ta 16Bit Ta 16 Ta " 2 3 4 5 6 7 8" -.It aic7899 Ta 20 Ta PCI/64 Ta 80MHz Ta 16Bit Ta 16 Ta " 2 3 4 5 6 7 8" -.El -.Pp -.Bl -enum -compact -.It -Multiplexed Twin Channel Device - One controller servicing two busses. -.It -Multi-function Twin Channel Device - Two controllers on one chip. -.It -Command Channel Secondary DMA Engine - Allows scatter gather list and -SCB prefetch. -.It -64 Byte SCB Support - SCSI CDB is embedded in the SCB to eliminate an extra DMA. -.It -Block Move Instruction Support - Doubles the speed of certain sequencer -operations. -.It -.Sq Bayonet -style Scatter Gather Engine - Improves S/G prefetch performance. -.It -Queuing Registers - Allows queueing of new transactions without pausing the -sequencer. -.It -Multiple Target IDs - Allows the controller to respond to selection as a -target on multiple SCSI IDs. -.El -.Ed -.Sh HARDWARE -The -.Nm -driver supports the following -.Tn SCSI -host adapter chips and -.Tn SCSI -controller cards: -.Pp -.Bl -bullet -compact -.It -Adaptec -.Tn AIC7770 -host adapter chip -.It -Adaptec -.Tn AIC7850 -host adapter chip -.It -Adaptec -.Tn AIC7860 -host adapter chip -.It -Adaptec -.Tn AIC7870 -host adapter chip -.It -Adaptec -.Tn AIC7880 -host adapter chip -.It -Adaptec -.Tn AIC7890 -host adapter chip -.It -Adaptec -.Tn AIC7891 -host adapter chip -.It -Adaptec -.Tn AIC7892 -host adapter chip -.It -Adaptec -.Tn AIC7895 -host adapter chip -.It -Adaptec -.Tn AIC7896 -host adapter chip -.It -Adaptec -.Tn AIC7897 -host adapter chip -.It -Adaptec -.Tn AIC7899 -host adapter chip -.It -Adaptec -.Tn 274X(W) -.It -Adaptec -.Tn 274X(T) -.It -Adaptec -.Tn 284X -.It -Adaptec -.Tn 2910 -.It -Adaptec -.Tn 2915 -.It -Adaptec -.Tn 2920 -.It -Adaptec -.Tn 2930C -.It -Adaptec -.Tn 2930U2 -.It -Adaptec -.Tn 2940 -.It -Adaptec -.Tn 2940J -.It -Adaptec -.Tn 2940N -.It -Adaptec -.Tn 2940U -.It -Adaptec -.Tn 2940AU -.It -Adaptec -.Tn 2940UW -.It -Adaptec -.Tn 2940UW Dual -.It -Adaptec -.Tn 2940UW Pro -.It -Adaptec -.Tn 2940U2W -.It -Adaptec -.Tn 2940U2B -.It -Adaptec -.Tn 2950U2W -.It -Adaptec -.Tn 2950U2B -.It -Adaptec -.Tn 19160B -.It -Adaptec -.Tn 29160B -.It -Adaptec -.Tn 29160N -.It -Adaptec -.Tn 3940 -.It -Adaptec -.Tn 3940U -.It -Adaptec -.Tn 3940AU -.It -Adaptec -.Tn 3940UW -.It -Adaptec -.Tn 3940AUW -.It -Adaptec -.Tn 3940U2W -.It -Adaptec -.Tn 3950U2 -.It -Adaptec -.Tn 3960 -.It -Adaptec -.Tn 39160 -.It -Adaptec -.Tn 3985 -.It -Adaptec -.Tn 4944UW -.It -NEC PC-9821Xt13 (PC-98) -.It -NEC RvII26 (PC-98) -.It -NEC PC-9821X-B02L/B09 (PC-98) -.It -NEC SV-98/2-B03 (PC-98) -.It -Many motherboards with on-board -.Tn SCSI -support -.El -.Sh SCSI CONTROL BLOCKS (SCBs) -Every transaction sent to a device on the SCSI bus is assigned a -.Sq SCSI Control Block -(SCB). -The SCB contains all of the information required by the -controller to process a transaction. -The chip feature table lists -the number of SCBs that can be stored in on-chip memory. -All chips -with model numbers greater than or equal to 7870 allow for the on chip -SCB space to be augmented with external SRAM up to a maximum of 255 SCBs. -Very few Adaptec controller configurations have external SRAM. -.Pp -If external SRAM is not available, SCBs are a limited resource. -Using the SCBs in a straight forward manner would only allow the driver to -handle as many concurrent transactions as there are physical SCBs. -To fully utilize the SCSI bus and the devices on it, -requires much more concurrency. -The solution to this problem is -.Em SCB Paging , -a concept similar to memory paging. -SCB paging takes advantage of -the fact that devices usually disconnect from the SCSI bus for long -periods of time without talking to the controller. -The SCBs for disconnected transactions are only of use to the controller -when the transfer is resumed. -When the host queues another transaction -for the controller to execute, the controller firmware will use a -free SCB if one is available. -Otherwise, the state of the most recently -disconnected (and therefore most likely to stay disconnected) SCB is -saved, via dma, to host memory, and the local SCB reused to start -the new transaction. -This allows the controller to queue up to -255 transactions regardless of the amount of SCB space. -Since the -local SCB space serves as a cache for disconnected transactions, the -more SCB space available, the less host bus traffic consumed saving -and restoring SCB data. -.Sh SEE ALSO -.Xr cd 4 , -.Xr da 4 , -.Xr sa 4 , -.Xr scsi 4 -.Sh HISTORY -The -.Nm -driver appeared in -.Fx 2.0 . -.Sh AUTHORS -The -.Nm -driver, the -.Tn AIC7xxx -sequencer-code assembler, -and the firmware running on the aic7xxx chips were written by -.An Justin T. Gibbs . -.Sh BUGS -Some Quantum drives (at least the Empire 2100 and 1080s) will not run on an -.Tn AIC7870 -Rev B in synchronous mode at 10MHz. -Controllers with this problem have a -42 MHz clock crystal on them and run slightly above 10MHz. -This confuses the drive and hangs the bus. -Setting a maximum synchronous negotiation rate of 8MHz in the -.Tn SCSI-Select -utility will allow normal operation. -.Pp -Although the Ultra2 and Ultra160 products have sufficient instruction -ram space to support both the initiator and target roles concurrently, -this configuration is disabled in favor of allowing the target role -to respond on multiple target ids. -A method for configuring dual role mode should be provided. -.Pp -Tagged Queuing is not supported in target mode. -.Pp -Reselection in target mode fails to function correctly on all high -voltage differential boards as shipped by Adaptec. -Information on -how to modify HVD board to work correctly in target mode is available -from Adaptec. diff --git a/share/man/man4/ahd.4 b/share/man/man4/ahd.4 deleted file mode 100644 index f4318e3a17..0000000000 --- a/share/man/man4/ahd.4 +++ /dev/null @@ -1,184 +0,0 @@ -.\" -.\" Copyright (c) 1995, 1996, 1997, 1998, 2000 -.\" Justin T. Gibbs. All rights reserved. -.\" Copyright (c) 2002 -.\" Scott Long. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" $FreeBSD: src/share/man/man4/ahd.4,v 1.6.2.1 2006/06/05 19:30:28 brueffer Exp $ -.\" -.Dd July 7, 2007 -.Dt AHD 4 -.Os -.Sh NAME -.Nm ahd -.Nd Adaptec PCI/PCI-X Ultra320 SCSI host adapter driver -.Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device pci" -.Cd "device scbus" -.Cd "device ahd" -.Pp -To compile in debugging code: -.Cd options AHD_DEBUG -.Cd options AHD_DEBUG_OPTS= -.Cd options AHD_REG_PRETTY_PRINT -.Pp -To configure one or more controllers to assume the target role: -.Cd options AHD_TMODE_ENABLE= -.Ed -.Pp -Alternatively, to load the driver as a -module at boot time, place the following line in -.Xr loader.conf 5 : -.Bd -literal -offset indent -ahd_load="YES" -.Ed -.Sh DESCRIPTION -This driver provides access to the -.Tn SCSI -bus(es) connected to Adaptec -.Tn AIC79xx -host adapter chips. -.Pp -Driver features include support for narrow and wide busses, -fast, ultra, ultra2, ultra160, and ultra320 synchronous transfers, -packetized transfers, tagged queueing, 512 SCB's, and target mode. -.Pp -The -.Dv AHD_DEBUG_OPTS -option is used to control which diagnostic messages are printed to the -console when -.Dv AHD_DEBUG -is enabled. -Logically OR the following bits together: -.Bl -column -offset indent ".Em Value" ".Em Function" -.It Em Value Ta Em Function -.It 0x00001 Ta Show miscellaneous information -.It 0x00002 Ta Show sense data -.\"0x00004 XXX: AHD_SHOW_RECOVERY -.It 0x00008 Ta Show Serial EEPROM contents -.It 0x00010 Ta Show bus termination settings -.It 0x00020 Ta Show host memory usage -.It 0x00040 Ta Show SCSI protocol messages -.It 0x00080 Ta Show mode pointer of the chip register window -.It 0x00100 Ta Show selection timeouts -.It 0x00200 Ta Show FIFO usage messages -.It 0x00400 Ta Show Queue Full status -.\"0x00800 XXX: AHD_SHOW_DV -.\"0x01000 XXX: AHD_SHOW_MASKED_ERRORS -.It 0x02000 Ta Show SCB queue status -.It 0x04000 Ta Show inbound packet information -.It 0x08000 Ta Show S/G list information -.\"0x10000 XXX: AHD_SHOW_INT_COALESCING -.It 0x20000 Ta Enable extra diagnostic code in the firmware -.El -.Pp -The -.Dv AHD_REG_PRETTY_PRINT -option compiles in support for human-readable bit definitions for each register -that is printed by the debugging code. -However, it also bloats the compiled -size of the driver by approximately 215KB. -.Pp -Individual controllers may be configured to operate in the target role -through the -.Dv AHD_TMODE_ENABLE -configuration option. -The value assigned to this option should be a bitmap -of all units where target mode is desired. -For example, a value of 0x25 would enable target mode on units 0, 2, and 5. -Note that target mode is only supported for ultra160 speeds and below. -.Pp -Per target configuration performed in the -.Tn SCSI-Select -menu, accessible at boot, -is honored by this driver. -This includes synchronous/asynchronous transfers, -maximum synchronous negotiation rate, -wide transfers, -disconnection, -and the host adapter's -.Tn SCSI -ID. -.Sh HARDWARE -The -.Nm -driver supports the following: -.Pp -.Bl -bullet -compact -.It -Adaptec -.Tn AIC7901 -host adapter chip -.It -Adaptec -.Tn AIC7901A -host adapter chip -.It -Adaptec -.Tn AIC7902 -host adapter chip -.It -Adaptec -.Tn 29320 -host adapter -.It -Adaptec -.Tn 39320 -host adapter -.It -Many motherboards with on-board -.Tn SCSI -support -.El -.Sh SEE ALSO -.Xr ahc 4 , -.Xr cd 4 , -.Xr da 4 , -.Xr sa 4 , -.Xr scsi 4 -.Sh HISTORY -The -.Nm -driver first appeared in -.Fx 4.7 . -.Sh AUTHORS -The -.Nm -driver, the -.Tn AIC7xxx -sequencer-code assembler, -and the firmware running on the aic79xx chips were written by -.An Justin T. Gibbs . -This manual page is based on the -.Xr ahc 4 -manual page. -.Sh BUGS -The current generation of 79xx chips do not support target mode in Ultra320 -mode. -Target mode in general has not been well tested in this driver. diff --git a/share/man/man4/aic.4 b/share/man/man4/aic.4 deleted file mode 100644 index a6892e4212..0000000000 --- a/share/man/man4/aic.4 +++ /dev/null @@ -1,52 +0,0 @@ -.\" -.\" Copyright (c) 1994 James A. Jegers -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" $FreeBSD: src/share/man/man4/man4.i386/aic.4,v 1.16 2005/01/21 08:36:38 ru Exp $ -.\" -.Dd March 31, 2012 -.Dt AIC 4 -.Os -.Sh NAME -.Nm aic -.Nd Adaptec AIC-6260 and AIC-6360 SCSI driver -.Sh SYNOPSIS -.Cd "device aic" -.Sh DESCRIPTION -The -.Nm -driver provides support for the Adaptec AHA-1460, AHA-1460B, AHA-1460C, and -AHA-1460D PC Card adapters based on the Adaptec AIC-6260 and AIC-6360 SCSI -controller chips. -Many systems that use these controller chips do not have a boot ROM -and therefore cannot be booted from. -.Sh SEE ALSO -.Xr ahc 4 , -.Xr cd 4 , -.Xr ch 4 , -.Xr da 4 , -.Xr intro 4 , -.Xr sa 4 -.Sh BUGS -The driver does not work well with multiple devices on the SCSI bus. -The driver works well with devices like CDROMs and Tape drives. -The driver works not so well with disk drives. diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index 918f0c184a..da279aee11 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -33,9 +33,9 @@ .Nd CAM SCSI subsystem .Sh SYNOPSIS .Cd "device scbus" -.Cd "device scbus1 at ahc0" -.Cd "device scbus3 at ahc1 bus 0" -.Cd "device scbus2 at ahc1 bus 1" +.Cd "device scbus1 at ahci0" +.Cd "device scbus3 at ahci1 bus 0" +.Cd "device scbus2 at ahci1 bus 1" .Cd "device cd" .Cd "device ch" .Cd "device da" @@ -158,12 +158,12 @@ to assign changer 1 as the changer with SCSI ID 4, SCSI logical unit 0 on SCSI bus 0. Individual scbuses can be wired down to specific controllers with a config line similar to -.Cd "device scbus0 at ahc0" -which assigns scsi bus 0 to the first unit using the ahc driver. +.Cd "device scbus0 at ahci0" +which assigns scsi bus 0 to the first unit using the ahci driver. For controllers supporting more than one bus, the particular bus can be specified as in -.Cd "device scbus3 at ahc1 bus 1" -which assigns scbus 1 to the second bus probed on the ahc1 device. +.Cd "device scbus3 at ahci1 bus 1" +which assigns scbus 1 to the second bus probed on the ahci1 device. .Pp When you have a mixture of wired down and counted devices then the counting begins with the first non-wired down unit for a particular @@ -258,7 +258,7 @@ utility. See .Xr camcontrol 8 for details. .Sh SEE ALSO -.Xr ahc 4 , +.Xr ahci 4 , .Xr bt 4 , .Xr cd 4 , .Xr ch 4 , diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4 index 702c8e4186..6571271839 100644 --- a/share/man/man4/targ.4 +++ b/share/man/man4/targ.4 @@ -123,7 +123,6 @@ are the control devices. .El .Sh SEE ALSO .Pa /usr/share/examples/scsi_target , -.Xr ahc 4 , .Xr isp 4 , .Xr scsi 4 .Rs @@ -145,11 +144,5 @@ by .An Nate Lawson Aq Mt nate@root.org . .Sh BUGS Currently, only the -.Xr ahc 4 -and .Xr isp 4 -drivers fully support target mode. -.Pp -The -.Xr ahc 4 -driver does not support tagged queuing in target mode. +driver fully supports target mode. diff --git a/sys/sys/camlib.h b/sys/sys/camlib.h index 18e217814e..65632107f5 100644 --- a/sys/sys/camlib.h +++ b/sys/sys/camlib.h @@ -23,7 +23,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libcam/camlib.h,v 1.2 1999/08/28 00:04:06 peter Exp $ - * $DragonFly: src/sys/sys/camlib.h,v 1.6 2007/11/24 03:13:03 pavalos Exp $ */ /* * Buffer encoding/decoding routines taken from the original FreeBSD SCSI @@ -115,7 +114,7 @@ struct cam_device { * particular device. */ - char sim_name[SIM_IDLEN+1]; /* Controller name, e.g. 'ahc' */ + char sim_name[SIM_IDLEN+1]; /* Controller name, e.g. 'ahci' */ u_int32_t sim_unit_number; /* Controller unit number */ u_int32_t bus_id; /* Controller bus number */ lun_id_t target_lun; /* Logical Unit Number */ diff --git a/tools/tools/kerninclude/kerninclude.sh b/tools/tools/kerninclude/kerninclude.sh index 6763dd7b5b..f5c3d9f296 100644 --- a/tools/tools/kerninclude/kerninclude.sh +++ b/tools/tools/kerninclude/kerninclude.sh @@ -101,7 +101,6 @@ do ( cd $i ; ls *.o 2>/dev/null ) done ) | sed ' -/aicasm/d /genassym/d /vers.o/d /setdef0.o/d diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh index ddbf5a7c1e..23f49a71a9 100644 --- a/tools/tools/kernxref/kernxref.sh +++ b/tools/tools/kernxref/kernxref.sh @@ -19,7 +19,7 @@ cd ${COMPILEDIR}/${KERNELNAME} nm -gon `echo *.o /boot/kernel/*.ok \ | tr ' ' '\012' \ - | egrep -v '(aicasm|genassym)'` \ + | egrep -v '(genassym)'` \ | tr : ' ' | awk ' NF > 1 { if (length($2) == 8) { -- 2.41.0