PERFORCE change 38011 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Sep 13 14:25:18 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38011
Change 38011 by marcel at marcel_nfs on 2003/09/13 14:24:21
IFC @38008
Affected files ...
.. //depot/projects/ia64/bin/sh/mkbuiltins#4 integrate
.. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#5 integrate
.. //depot/projects/ia64/lib/libc/gen/devname.3#6 integrate
.. //depot/projects/ia64/lib/libc/posix1e/mac_get.3#6 integrate
.. //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#3 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 integrate
.. //depot/projects/ia64/share/man/man4/mac_mls.4#13 integrate
.. //depot/projects/ia64/share/man/man4/natm.4#7 integrate
.. //depot/projects/ia64/share/man/man4/puc.4#4 integrate
.. //depot/projects/ia64/share/man/man7/hier.7#22 integrate
.. //depot/projects/ia64/share/man/man7/ports.7#9 integrate
.. //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#10 integrate
.. //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#8 integrate
.. //depot/projects/ia64/sys/boot/forth/beastie.4th#4 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#17 integrate
.. //depot/projects/ia64/sys/coda/coda_vfsops.c#11 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#14 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpiio.h#5 integrate
.. //depot/projects/ia64/sys/dev/isp/isp.c#20 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#16 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#15 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_inline.h#9 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_target.c#9 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_target.h#6 integrate
.. //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#3 integrate
.. //depot/projects/ia64/sys/dev/isp/ispvar.h#12 integrate
.. //depot/projects/ia64/sys/dev/uart/uart_dev_ns8250.c#3 integrate
.. //depot/projects/ia64/sys/kern/kern_xxx.c#6 integrate
.. //depot/projects/ia64/sys/kern/vfs_bio.c#59 integrate
.. //depot/projects/ia64/sys/pc98/pc98/fd.c#22 integrate
.. //depot/projects/ia64/sys/posix4/ksched.c#10 integrate
.. //depot/projects/ia64/sys/vm/vm_object.c#65 integrate
.. //depot/projects/ia64/usr.sbin/acpi/acpiconf/acpiconf.8#6 integrate
.. //depot/projects/ia64/usr.sbin/acpi/acpiconf/acpiconf.c#6 integrate
.. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#21 integrate
Differences ...
==== //depot/projects/ia64/bin/sh/mkbuiltins#4 (text+ko) ====
@@ -35,11 +35,11 @@
# SUCH DAMAGE.
#
# @(#)mkbuiltins 8.2 (Berkeley) 5/4/95
-# $FreeBSD: src/bin/sh/mkbuiltins,v 1.11 2002/10/18 10:33:32 tjr Exp $
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.12 2003/09/13 06:59:22 schweikh Exp $
temp=`/usr/bin/mktemp -t ka`
havejobs=0
-if grep '^#define JOBS[ ]*1' shell.h > /dev/null
+if grep '^#define[ ]*JOBS[ ]*1' shell.h > /dev/null
then havejobs=1
fi
havehist=1
==== //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#5 (text+ko) ====
@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.16 2003/03/19 18:14:47 eivind Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.17 2003/09/13 15:46:35 eivind Exp $
My Favorite Drugs [Sung to My Favorite Things]
Reefers and roach clips and papers and rollers
Cocaine and procaine for twenty year molars
@@ -770,8 +770,8 @@
Haggis is a kind of stuff black pudding eaten by the Scots and
considered by them to be not only a delicacy but fit for human
consumption. The minced heart, liver and lungs of a sheep, calf or
-other animal's inner organs are mixed with oatmeal, sealed and boiled
-in maw in the sheep's intestinal stomach-bag and ... Excuse me a minute....
+other animal are mixed with oatmeal, sealed and boiled in maw in the sheep's
+intestinal stomach-bag and ... Excuse me a minute....
%
Hardly a pure science, history is closer to animal husbandry than it is
to mathematics, in that it involves selective breeding. The principal
@@ -1350,9 +1350,6 @@
do with the other.
-- Jules Feiffer
%
-Republicans consume three-fourths of the rutabaga produced in this
-country. The remainder is thrown out.
-%
Republicans raise dahlias, Dalmatians and eyebrows.
Democrats raise Airedales, kids and taxes.
@@ -1663,7 +1660,7 @@
the Catholic Church, and the National Rifle
Association
%
-Sure eating yogurt will improve your sex life. People know that if
+Sure eating yoghurt will improve your sex life. People know that if
you'll eat that stuff, you'll eat anything.
%
Sure, Reagan has promised to take senility tests. But what if he
==== //depot/projects/ia64/lib/libc/gen/devname.3#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)devname.3 8.2 (Berkeley) 4/29/95
-.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.16 2003/06/20 09:52:27 phk Exp $
+.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.17 2003/09/12 21:54:10 ru Exp $
.\"
.Dd July 18, 1999
.Dt DEVNAME 3
@@ -79,7 +79,7 @@
.Fn devname_r
takes a buffer and length as argument to avoid this problem.
.Sh SEE ALSO
-.Xr stat 2 ,
+.Xr stat 2
.Sh HISTORY
The
.Fn devname
==== //depot/projects/ia64/lib/libc/posix1e/mac_get.3#6 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.7 2003/09/12 21:54:10 ru Exp $
.\"
.Dd December 21, 2001
.Dt MAC_GET 3
@@ -110,9 +110,9 @@
.Sh SEE ALSO
.Xr mac 3 ,
.Xr mac_free 3 ,
-.Xr mac_text 3 ,
.Xr mac_prepare 3 ,
.Xr mac_set 3 ,
+.Xr mac_text 3 ,
.Xr mac 4 ,
.Xr mac 9
.Sh STANDARDS
==== //depot/projects/ia64/lib/libc/sys/ntp_gettime.2#3 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.2 2003/06/21 20:27:54 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/ntp_gettime.2,v 1.3 2003/09/12 21:54:10 ru Exp $
.\"
.Dd June 21, 2003
.Dt NTP_GETTIME 2
@@ -105,10 +105,12 @@
.El
.Sh SEE ALSO
.Xr ntp_adjtime 2 ,
-.Xr ntpd 8 ,
-.Dq Li http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html ,
-.Dq Li http://www.boulder.nist.gov/timefreq/general/faq.htm ,
-.Dq Li ftp://time.nist.gov/pub/leap-seconds.list
+.Xr ntpd 8
+.Bl -tag -width indent
+.It Pa http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html
+.It Pa http://www.boulder.nist.gov/timefreq/general/faq.htm
+.It Pa ftp://time.nist.gov/pub/leap-seconds.list
+.El
.Sh AUTHORS
This manual page was written by
.An Tom Rhodes Aq trhodes at FreeBSD.org .
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#68 (text+ko) ====
@@ -29,7 +29,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.181 2003/09/11 16:03:46 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.182 2003/09/13 12:51:12 nyan Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -1586,7 +1586,7 @@
<para arch="i386">Broadcom BCM4401 based Fast Ethernet adapters
(&man.bfe.4; driver)</para>
- <para arch="i386">RealTek RTL8139C+, RTL8169, RTL8169S and
+ <para arch="i386,pc98">RealTek RTL8139C+, RTL8169, RTL8169S and
RTL8110S based PCI Fast Ethernet and Gigabit Ethernet
controllers (&man.re.4; driver)</para>
==== //depot/projects/ia64/share/man/man4/mac_mls.4#13 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.15 2003/06/01 21:52:59 ru Exp $
+.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.16 2003/09/12 21:54:10 ru Exp $
.\"
.Dd December 1, 2002
.Os
@@ -217,7 +217,7 @@
.Xr mac_partition 4 ,
.Xr mac_portacl 4 ,
.Xr mac_seeotheruids 4 ,
-.Xr mac_test 4
+.Xr mac_test 4 ,
.Xr maclabel 7 ,
.Xr mac 9
.Sh HISTORY
==== //depot/projects/ia64/share/man/man4/natm.4#7 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/share/man/man4/natm.4,v 1.15 2003/07/15 12:07:45 harti Exp $
+.\" $FreeBSD: src/share/man/man4/natm.4,v 1.16 2003/09/12 21:54:10 ru Exp $
.\"
.Dd December 29, 1997
.Dt NATM 4
@@ -92,8 +92,8 @@
.Xr en 4 ,
.Xr fatm 4 ,
.Xr hatm 4 ,
-.Xr patm 4 ,
-.Xr natmip 4
+.Xr natmip 4 ,
+.Xr patm 4
.Sh AUTHORS
.An Chuck Cranor
of Washington University implemented the NATM protocol layer
==== //depot/projects/ia64/share/man/man4/puc.4#4 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/puc.4,v 1.3 2003/08/01 02:25:31 ambrisko Exp $
+.\" $FreeBSD: src/share/man/man4/puc.4,v 1.4 2003/09/12 21:54:11 ru Exp $
.\"
.Dd February 7, 2002
.Dt PUC 4
@@ -59,8 +59,8 @@
errors.
It cannot be used if the interrupt is shared.
.Sh SEE ALSO
+.Xr ppc 4 ,
.Xr sio 4
-.Xr ppc 4
.Sh HISTORY
This driver took the idea from the
.Nx
==== //depot/projects/ia64/share/man/man7/hier.7#22 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man7/hier.7,v 1.86 2003/08/08 11:15:57 simon Exp $
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.87 2003/09/13 16:23:49 eivind Exp $
.\"
.Dd June 5, 1993
.Dt HIER 7
@@ -683,9 +683,10 @@
.It Pa db/
misc. automatically generated system-specific database files
.It Pa empty/
-empty directory used by
+empty directory for use by programs that need a specifically empty directory.
+Used for instance by
.Xr sshd 8
-for privilege separation
+for privilege separation.
.It Pa games/
misc. game status and score files
.It Pa heimdal/
==== //depot/projects/ia64/share/man/man7/ports.7#9 (text+ko) ====
@@ -23,7 +23,7 @@
.\" (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/man7/ports.7,v 1.37 2003/06/23 20:01:58 ru Exp $
+.\" $FreeBSD: src/share/man/man7/ports.7,v 1.38 2003/09/13 16:16:31 eivind Exp $
.\"
.Dd January 25, 1998
.Dt PORTS 7
@@ -360,9 +360,6 @@
.An -nosplit
This man page was originated by
.An David O'Brien .
-The ports collection is maintained by
-.An Satoshi Asami
-and the Awesome Ports Team.
.Sh HISTORY
The Ports Collection
appeared in
==== //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#10 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.19 2003/06/05 14:20:48 rwatson Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_GETEXTATTR.9,v 1.20 2003/09/12 21:54:11 ru Exp $
.\"
.Dd December 23, 1999
.Os
@@ -123,7 +123,7 @@
.Sh SEE ALSO
.Xr extattr 9 ,
.Xr vnode 9 ,
-.Xr VOP_LISTEXTATTR 9
+.Xr VOP_LISTEXTATTR 9 ,
.Xr VOP_SETEXTATTR 9
.Sh BUGS
By passing in the empty string as the attribute name, some file systems
==== //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#8 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.17 2003/06/08 13:27:57 charnier Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_SETEXTATTR.9,v 1.18 2003/09/12 21:54:11 ru Exp $
.\"
.Dd December 23, 1999
.Os
@@ -112,7 +112,7 @@
.Sh SEE ALSO
.Xr extattr 9 ,
.Xr vnode 9 ,
-.Xr VOP_GETEXTATTR 9
+.Xr VOP_GETEXTATTR 9 ,
.Xr VOP_LISTEXTATTR 9
.Sh AUTHORS
This man page was written by
==== //depot/projects/ia64/sys/boot/forth/beastie.4th#4 (text+ko) ====
@@ -1,4 +1,5 @@
\ Copyright (c) 2003 Scott Long <scottl at freebsd.org>
+\ Copyright (c) 2003 Aleksander Fafula <alex at fafula.com>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
@@ -22,7 +23,7 @@
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.4 2003/06/10 22:04:09 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $
marker task-beastie.4th
@@ -48,7 +49,29 @@
46 constant dot
\ The BSD Daemon. He is 19 rows high and 34 columns wide
-: print-beastie ( x y -- )
+: technicolor-beastie ( x y -- )
+2dup at-xy ." [1;31m, ," 1+
+2dup at-xy ." /( )`" 1+
+2dup at-xy ." \ \___ / |" 1+
+2dup at-xy ." /- [37m_[31m `-/ '" 1+
+2dup at-xy ." ([37m/\/ \[31m \ /\" 1+
+2dup at-xy ." [37m/ / |[31m ` \" 1+
+2dup at-xy ." [34mO O [37m) [31m/ |" 1+
+2dup at-xy ." [37m`-^--'[31m`< '" 1+
+2dup at-xy ." (_.) _ ) /" 1+
+2dup at-xy ." `.___/` / " 1+
+2dup at-xy ." `-----' /" 1+
+2dup at-xy ." [33m<----.[31m __ / __ \" 1+
+2dup at-xy ." [33m<----|====[31mO)))[33m==[31m) \) /[33m====|" 1+
+2dup at-xy ." [33m<----'[31m `--' `.__,' \" 1+
+2dup at-xy ." | |" 1+
+2dup at-xy ." \ / /\" 1+
+2dup at-xy ." [36m______[31m( (_ / \______/" 1+
+2dup at-xy ." [36m,' ,-----' |" 1+
+at-xy ." `--{__________) [0m" 1+
+;
+
+: boring-beastie ( x y -- )
2dup at-xy ." , ," 1+
2dup at-xy ." /( )`" 1+
2dup at-xy ." \ \___ / |" 1+
@@ -70,6 +93,20 @@
at-xy ." `--{__________)"
;
+: print-beastie ( x y -- )
+ s" loader_color" getenv
+ dup -1 = if
+ drop
+ boring-beastie
+ exit
+ then
+ s" YES" compare-insensitive 0<> if
+ boring-beastie
+ exit
+ then
+ technicolor-beastie
+;
+
: acpienabled? ( -- flag )
s" acpi_load" getenv
dup -1 = if
==== //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#17 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.96 2003/06/10 18:14:05 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.97 2003/09/13 02:01:56 mjacob Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -2765,8 +2765,10 @@
/* set the speed to the current value */
mode_hdr->dev_spec = current_speed;
- /* set single-initiator buffering mode */
- mode_hdr->dev_spec |= SMH_SA_BUF_MODE_SIBUF;
+ /* if set, set single-initiator buffering mode */
+ if (softc->buffer_mode == SMH_SA_BUF_MODE_SIBUF) {
+ mode_hdr->dev_spec |= SMH_SA_BUF_MODE_SIBUF;
+ }
if (mode_blk)
mode_hdr->blk_desc_len = sizeof(struct scsi_mode_blk_desc);
==== //depot/projects/ia64/sys/coda/coda_vfsops.c#11 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.46 2003/09/07 07:43:09 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.47 2003/09/13 01:13:56 tjr Exp $");
#include <vcoda.h>
@@ -253,7 +253,9 @@
ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount");
mi->mi_rootvp->v_vflag &= ~VV_ROOT;
error = vflush(mi->mi_vfsp, 0, FORCECLOSE);
+#ifdef CODA_VERBOSE
printf("coda_unmount: active = %d, vflush active %d\n", active, error);
+#endif
error = 0;
/* I'm going to take this out to allow lookups to go through. I'm
* not sure it's important anyway. -- DCS 2/2/94
==== //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.23 2003/09/11 03:17:33 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.24 2003/09/13 20:13:01 njl Exp $
*/
#include "opt_acpi.h"
@@ -264,7 +264,7 @@
goto end;
}
- PKG_GETINT(res, tmp, 0, sc->bif.unit, end);
+ PKG_GETINT(res, tmp, 0, sc->bif.units, end);
PKG_GETINT(res, tmp, 1, sc->bif.dcap, end);
PKG_GETINT(res, tmp, 2, sc->bif.lfcap, end);
PKG_GETINT(res, tmp, 3, sc->bif.btech, end);
@@ -404,7 +404,7 @@
case ACPIIO_CMBAT_GET_BIF:
acpi_cmbat_get_bif(dev);
bifp = &ioctl_arg->bif;
- bifp->unit = sc->bif.unit;
+ bifp->units = sc->bif.units;
bifp->dcap = sc->bif.dcap;
bifp->lfcap = sc->bif.lfcap;
bifp->btech = sc->bif.btech;
==== //depot/projects/ia64/sys/dev/acpica/acpiio.h#5 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.8 2003/08/28 16:06:30 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.9 2003/09/13 20:13:01 njl Exp $
*/
/*
@@ -50,10 +50,10 @@
#define ACPI_CMBAT_MAXSTRLEN 32
struct acpi_bif {
- u_int32_t unit; /* 0 for mWh, 1 for mAh */
+ u_int32_t units; /* 0 for mWh, 1 for mAh */
u_int32_t dcap; /* Design Capacity */
u_int32_t lfcap; /* Last Full capacity */
- u_int32_t btech; /* Battery Technorogy */
+ u_int32_t btech; /* Battery Technology */
u_int32_t dvol; /* Design voltage (mV) */
u_int32_t wcap; /* WARN capacity */
u_int32_t lcap; /* Low capacity */
==== //depot/projects/ia64/sys/dev/isp/isp.c#20 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.107 2003/08/25 17:58:23 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.108 2003/09/13 01:55:44 mjacob Exp $ */
/*
* Machine and OS Independent (well, as best as possible)
* code for the Qlogic ISP SCSI adapters.
@@ -1249,6 +1249,17 @@
icbp->icb_retry_delay = fcp->isp_retry_delay;
icbp->icb_retry_count = fcp->isp_retry_count;
icbp->icb_hardaddr = loopid;
+ if (icbp->icb_hardaddr >= 125) {
+ /*
+ * We end up with a Loop ID of 255 for F-Port topologies
+ */
+ if (icbp->icb_hardaddr != 255) {
+ isp_prt(isp, ISP_LOGERR,
+ "bad hard address %u- resetting to zero",
+ icbp->icb_hardaddr);
+ }
+ icbp->icb_hardaddr = 0;
+ }
/*
* Right now we just set extended options to prefer point-to-point
* over loop based upon some soft config options.
@@ -1371,7 +1382,13 @@
icbp->icb_fwoptions &= ~(ICBOPT_BOTH_WWNS|ICBOPT_FULL_LOGIN);
}
icbp->icb_rqstqlen = RQUEST_QUEUE_LEN(isp);
+ if (icbp->icb_rqstqlen < 1) {
+ isp_prt(isp, ISP_LOGERR, "bad request queue length");
+ }
icbp->icb_rsltqlen = RESULT_QUEUE_LEN(isp);
+ if (icbp->icb_rsltqlen < 1) {
+ isp_prt(isp, ISP_LOGERR, "bad result queue length");
+ }
icbp->icb_rqstaddr[RQRSP_ADDR0015] = DMA_WD0(isp->isp_rquest_dma);
icbp->icb_rqstaddr[RQRSP_ADDR1631] = DMA_WD1(isp->isp_rquest_dma);
icbp->icb_rqstaddr[RQRSP_ADDR3247] = DMA_WD2(isp->isp_rquest_dma);
@@ -3859,7 +3876,7 @@
}
/*
- * Free any dma resources. As a side effect, this may
+ * Free any DMA resources. As a side effect, this may
* also do any cache flushing necessary for data coherence. */
if (XS_XFRLEN(xs)) {
ISP_DMAFREE(isp, xs, sp->req_handle);
==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#16 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.91 2003/08/24 17:49:14 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.92 2003/09/13 01:56:24 mjacob Exp $");
#include <dev/isp/isp_freebsd.h>
#include <sys/unistd.h>
@@ -399,8 +399,10 @@
hba->fc_scsi_supported = 1;
hba->fc_topology = FCPARAM(isp)->isp_topo + 1;
hba->fc_loopid = FCPARAM(isp)->isp_loopid;
- hba->active_node_wwn = FCPARAM(isp)->isp_nodewwn;
- hba->active_port_wwn = FCPARAM(isp)->isp_portwwn;
+ hba->nvram_node_wwn = FCPARAM(isp)->isp_nodewwn;
+ hba->nvram_port_wwn = FCPARAM(isp)->isp_portwwn;
+ hba->active_node_wwn = ISP_NODEWWN(isp);
+ hba->active_port_wwn = ISP_PORTWWN(isp);
ISP_UNLOCK(isp);
retval = 0;
break;
==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#15 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.71 2002/09/23 05:00:14 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.72 2003/09/13 01:56:45 mjacob Exp $ */
/*
* Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
* Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
@@ -76,8 +76,7 @@
#endif
#define HANDLE_LOOPSTATE_IN_OUTER_LAYERS 1
-/* turn this off for now */
-/* #define ISP_SMPLOCK 1 */
+#define ISP_SMPLOCK 1
#ifdef ISP_SMPLOCK
#define ISP_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY | INTR_MPSAFE
==== //depot/projects/ia64/sys/dev/isp/isp_inline.h#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.28 2002/09/23 05:00:37 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.29 2003/09/13 01:57:31 mjacob Exp $ */
/*
* Qlogic Host Adapter Inline Functions
*
@@ -975,7 +975,7 @@
ISP_IOXPUT_16(isp, atsrc->at_rxid, &atdst->at_rxid);
ISP_IOXPUT_16(isp, atsrc->at_flags, &atdst->at_flags);
ISP_IOXPUT_16(isp, atsrc->at_status, &atdst->at_status);
- ISP_IOXPUT_8(isp, atsrc->at_reserved1, &atdst->at_reserved1);
+ ISP_IOXPUT_8(isp, atsrc->at_crn, &atdst->at_crn);
ISP_IOXPUT_8(isp, atsrc->at_taskcodes, &atdst->at_taskcodes);
ISP_IOXPUT_8(isp, atsrc->at_taskflags, &atdst->at_taskflags);
ISP_IOXPUT_8(isp, atsrc->at_execodes, &atdst->at_execodes);
@@ -1005,7 +1005,7 @@
ISP_IOXGET_16(isp, &atsrc->at_rxid, atdst->at_rxid);
ISP_IOXGET_16(isp, &atsrc->at_flags, atdst->at_flags);
ISP_IOXGET_16(isp, &atsrc->at_status, atdst->at_status);
- ISP_IOXGET_8(isp, &atsrc->at_reserved1, atdst->at_reserved1);
+ ISP_IOXGET_8(isp, &atsrc->at_crn, atdst->at_crn);
ISP_IOXGET_8(isp, &atsrc->at_taskcodes, atdst->at_taskcodes);
ISP_IOXGET_8(isp, &atsrc->at_taskflags, atdst->at_taskflags);
ISP_IOXGET_8(isp, &atsrc->at_execodes, atdst->at_execodes);
@@ -1193,7 +1193,6 @@
static INLINE void
isp_get_ctio2(struct ispsoftc *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst)
{
- int i;
isp_copy_in_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header);
ISP_IOXGET_16(isp, &ctsrc->ct_reserved, ctdst->ct_reserved);
ISP_IOXGET_16(isp, &ctsrc->ct_fwhandle, ctdst->ct_fwhandle);
@@ -1206,16 +1205,6 @@
ISP_IOXGET_16(isp, &ctsrc->ct_seg_count, ctdst->ct_seg_count);
ISP_IOXGET_32(isp, &ctsrc->ct_reloff, ctdst->ct_reloff);
ISP_IOXGET_32(isp, &ctsrc->ct_resid, ctdst->ct_resid);
- for (i = 0; i < 4; i++) {
- ISP_IOXGET_32(isp, &ctsrc->rsp.fw._reserved[i],
- ctdst->rsp.fw._reserved[i]);
- }
- ISP_IOXGET_16(isp, &ctsrc->rsp.fw.ct_scsi_status,
- ctdst->rsp.fw.ct_scsi_status);
- for (i = 0; i < QLTM_SENSELEN; i++) {
- ISP_IOXGET_8(isp, &ctsrc->rsp.fw.ct_sense[i],
- ctdst->rsp.fw.ct_sense[i]);
- }
}
static INLINE void
==== //depot/projects/ia64/sys/dev/isp/isp_target.c#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.26 2003/05/31 19:49:49 phk Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.27 2003/09/13 01:58:26 mjacob Exp $ */
/*
* Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
*
@@ -363,7 +363,7 @@
return (-1);
}
- ISP_TDQE(isp, "isp_target_put_entry", (int) optr, ap);;
+ ISP_TDQE(isp, "isp_target_put_entry", (int) optr, ap);
ISP_ADD_REQUEST(isp, nxti);
return (0);
}
@@ -539,6 +539,11 @@
msg.nt_msg[0] = MSG_BUS_DEV_RESET;
(void) isp_async(isp, ISPASYNC_TARGET_MESSAGE, &msg);
break;
+ case ASYNC_CTIO_DONE:
+ evt.ev_bus = bus;
+ evt.ev_event = event;
+ (void) isp_async(isp, ISPASYNC_TARGET_EVENT, &evt);
+ return (0);
default:
isp_prt(isp, ISP_LOGERR,
"isp_target_async: unknown event 0x%x", event);
@@ -611,14 +616,18 @@
msg.nt_tagval = inp->in_seqid;
msg.nt_lun = lun;
- if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK) {
- isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK",
+ if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK_SET) {
+ isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK SET",
inp->in_iid, lun, inp->in_seqid);
- msg.nt_msg[0] = MSG_ABORT_TAG;
+ msg.nt_msg[0] = MSG_ABORT;
} else if (inp->in_task_flags & TASK_FLAGS_CLEAR_TASK_SET) {
isp_prt(isp, ISP_LOGINFO, f1, "CLEAR TASK SET",
inp->in_iid, lun, inp->in_seqid);
msg.nt_msg[0] = MSG_CLEAR_QUEUE;
+ } else if (inp->in_task_flags & TASK_FLAGS_LUN_RESET) {
+ isp_prt(isp, ISP_LOGINFO, f1, "LUN RESET",
+ inp->in_iid, lun, inp->in_seqid);
+ msg.nt_msg[0] = MSG_LUN_RESET;
} else if (inp->in_task_flags & TASK_FLAGS_TARGET_RESET) {
isp_prt(isp, ISP_LOGINFO, f1, "TARGET RESET",
inp->in_iid, lun, inp->in_seqid);
@@ -626,12 +635,7 @@
} else if (inp->in_task_flags & TASK_FLAGS_CLEAR_ACA) {
isp_prt(isp, ISP_LOGINFO, f1, "CLEAR ACA",
inp->in_iid, lun, inp->in_seqid);
- /* ???? */
msg.nt_msg[0] = MSG_REL_RECOVERY;
- } else if (inp->in_task_flags & TASK_FLAGS_TERMINATE_TASK) {
- isp_prt(isp, ISP_LOGINFO, f1, "TERMINATE TASK",
- inp->in_iid, lun, inp->in_seqid);
- msg.nt_msg[0] = MSG_TERM_IO_PROC;
} else {
isp_prt(isp, ISP_LOGWARN, f2, "task flag",
inp->in_status, lun, inp->in_iid,
@@ -1091,7 +1095,7 @@
/*
* CTIO rejected by the firmware - invalid data direction.
*/
- isp_prt(isp, ISP_LOGERR, "CTIO2 had wrong data directiond");
+ isp_prt(isp, ISP_LOGERR, "CTIO2 had wrong data direction");
break;
case CT_RSELTMO:
==== //depot/projects/ia64/sys/dev/isp/isp_target.h#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.20 2002/06/16 04:54:46 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.21 2003/09/13 01:58:26 mjacob Exp $ */
/*
* Qlogic Target Mode Structure and Flag Definitions
*
@@ -36,11 +36,8 @@
#ifndef _ISP_TARGET_H
#define _ISP_TARGET_H
-/*
- * Defines for all entry types
- */
+#define QLTM_SENSELEN 18 /* non-FC cards only */
#define QLTM_SVALID 0x80
-#define QLTM_SENSELEN 18
/*
* Structure for Enable Lun and Modify Lun queue entries
@@ -141,28 +138,33 @@
/*
* Values for the in_task_flags field- should only get one at a time!
*/
-#define TASK_FLAGS_ABORT_TASK (1<<9)
+#define TASK_FLAGS_CLEAR_ACA (1<<14)
+#define TASK_FLAGS_TARGET_RESET (1<<13)
+#define TASK_FLAGS_LUN_RESET (1<<12)
#define TASK_FLAGS_CLEAR_TASK_SET (1<<10)
-#define TASK_FLAGS_TARGET_RESET (1<<13)
-#define TASK_FLAGS_CLEAR_ACA (1<<14)
-#define TASK_FLAGS_TERMINATE_TASK (1<<15)
+#define TASK_FLAGS_ABORT_TASK_SET (1<<9)
+#ifndef MSG_ABORT
+#define MSG_ABORT 0x06
+#endif
+#ifndef MSG_BUS_DEV_RESET
+#define MSG_BUS_DEV_RESET 0x0c
+#endif
#ifndef MSG_ABORT_TAG
-#define MSG_ABORT_TAG 0x06
+#define MSG_ABORT_TAG 0x0d
#endif
#ifndef MSG_CLEAR_QUEUE
#define MSG_CLEAR_QUEUE 0x0e
#endif
-#ifndef MSG_BUS_DEV_RESET
-#define MSG_BUS_DEV_RESET 0x0b
-#endif
#ifndef MSG_REL_RECOVERY
#define MSG_REL_RECOVERY 0x10
#endif
#ifndef MSG_TERM_IO_PROC
#define MSG_TERM_IO_PROC 0x11
#endif
-
+#ifndef MSG_LUN_RESET
+#define MSG_LUN_RESET 0x17
+#endif
/*
* Notify Acknowledge Entry structure
@@ -274,7 +276,7 @@
u_int16_t at_rxid; /* response ID */
u_int16_t at_flags;
u_int16_t at_status; /* firmware status */
- u_int8_t at_reserved1;
+ u_int8_t at_crn; /* command reference number */
u_int8_t at_taskcodes;
u_int8_t at_taskflags;
u_int8_t at_execodes;
@@ -296,6 +298,9 @@
#define ATIO2_TC_ATTR_ACAQ 4
#define ATIO2_TC_ATTR_UNTAGGED 5
+#define ATIO2_EX_WRITE 0x1
+#define ATIO2_EX_READ 0x2
+
/*
* Continue Target I/O Entry structure
* Request from driver. The response from the
@@ -461,14 +466,6 @@
u_int32_t ct_datalen;
ispds_t ct_fcp_rsp_iudata;
} m2;
- /*
- * CTIO2 returned from F/W...
- */
- struct {
- u_int32_t _reserved[4];
- u_int16_t ct_scsi_status;
- u_int8_t ct_sense[QLTM_SENSELEN];
- } fw;
} rsp;
} ct2_entry_t;
@@ -485,6 +482,7 @@
#define CT2_DATAMASK CT_DATAMASK
#define CT2_CCINCR 0x0100
#define CT2_FASTPOST 0x0200
+#define CT2_TERMINATE 0x4000
#define CT2_SENDSTATUS 0x8000
/*
==== //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.8 2002/12/30 21:18:07 schweikh Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_tpublic.h,v 1.9 2003/09/13 01:58:51 mjacob Exp $ */
/*
* Qlogic ISP Host Adapter Public Target Interface Structures && Routines
*---------------------------------------
@@ -46,16 +46,16 @@
u_int64_t nt_iid; /* inititator id */
u_int64_t nt_tgt; /* target id */
u_int64_t nt_lun; /* logical unit */
+ u_int32_t nt_tagval; /* tag value */
u_int8_t nt_bus; /* bus */
u_int8_t nt_tagtype; /* tag type */
- u_int16_t nt_tagval; /* tag value */
u_int8_t nt_msg[IN_MSGLEN]; /* message content */
} tmd_msg_t;
typedef struct {
void * ev_hba; /* HBA tag */
- u_int16_t ev_bus; /* bus */
- u_int16_t ev_event; /* type of async event */
+ u_int32_t ev_bus; /* bus */
+ u_int32_t ev_event; /* type of async event */
} tmd_event_t;
/*
@@ -177,68 +177,89 @@
* The tag cd_error is to communicate between the MD layer and outer software
* the current error conditions.
*
- * The tag cd_reserved pads out the structure to 128 bytes. The first
- * half of the pad area is reserved to the MD layer, and the second half
- * may be used by outer layers, for scratch purposes.
+ * The tag cd_lreserved, cd_hreserved are scratch areas for use for the MD
+ * and outer layers respectively.
+ *
*/
-#ifndef _LP64
-#if defined(__alpha__) || defined(__sparcv9cpu) || defined(__sparc_v9__) ||\
- defined(__ia64__)
-#define _LP64
+#ifndef TMD_CDBLEN
+#define TMD_CDBLEN 16
+#endif
+#ifndef TMD_SENSELEN
+#define TMD_SENSELEN 24
#endif
+#ifndef QCDS
+#define QCDS 8
#endif
-#ifndef _TMD_PAD_LEN
-#ifdef _LP64
-#define _TMD_PAD_LEN 12
-#else
-#define _TMD_PAD_LEN 24
-#endif
-#endif
-#ifndef ATIO_CDBLEN
-#define ATIO_CDBLEN 26
-#endif
-#ifndef QLTM_SENSELEN
-#define QLTM_SENSELEN 18
-#endif
typedef struct tmd_cmd {
- void * cd_private; /* layer private data */
+ void * cd_private; /* private data pointer */
void * cd_hba; /* HBA tag */
void * cd_data; /* 'pointer' to data */
u_int64_t cd_iid; /* initiator ID */
u_int64_t cd_tgt; /* target id */
u_int64_t cd_lun; /* logical unit */
- u_int8_t cd_bus; /* bus */
- u_int8_t cd_tagtype; /* tag type */
u_int32_t cd_tagval; /* tag value */
- u_int8_t cd_cdb[ATIO_CDBLEN]; /* Command */
- u_int8_t cd_lflags; /* flags lower level sets */
- u_int8_t cd_hflags; /* flags higher level sets */
+ u_int32_t cd_lflags; /* flags lower level sets */
+ u_int32_t cd_hflags; /* flags higher level sets */
u_int32_t cd_totlen; /* total data requirement */
u_int32_t cd_resid; /* total data residual */
u_int32_t cd_xfrlen; /* current data requirement */
int32_t cd_error; /* current error */
- u_int8_t cd_sense[QLTM_SENSELEN];
- u_int16_t cd_scsi_status; /* closing SCSI status */
- u_int8_t cd_reserved[_TMD_PAD_LEN];
+ u_int32_t
+ cd_scsi_status : 16, /* closing SCSI status */
+ : 7,
+ cd_chan : 1, /* channel on card */
+ : 2,
+ cd_tagtype : 6; /* tag type */
+ u_int8_t cd_senselen;
+ u_int8_t cd_cdblen;
+ u_int8_t cd_sense[TMD_SENSELEN];
+ u_int8_t cd_cdb[TMD_CDBLEN]; /* Command */
+ union {
+ void * ptrs[QCDS / sizeof (void *)];
+ u_int64_t llongs[QCDS / sizeof (u_int64_t)];
+ u_int32_t longs[QCDS / sizeof (u_int32_t)];
+ u_int16_t shorts[QCDS / sizeof (u_int16_t)];
+ u_int8_t bytes[QCDS];
+ } cd_lreserved[2], cd_hreserved[2];
} tmd_cmd_t;
-#define CDFL_SNSVALID 0x01 /* sense data (from f/w) valid */
-#define CDFL_NODISC 0x02 /* disconnects disabled */
-#define CDFL_SENTSENSE 0x04 /* last action sent sense data */
-#define CDFL_SENTSTATUS 0x08 /* last action sent status */
+#ifndef TMD_SIZE
+#define TMD_SIZE (sizeof (tmd_cmd_t))
+#endif
+
+/*
+ * Note that NODISC (obviously) doesn't apply to non-SPI transport.
+ *
+ * Note that knowing the data direction and lengh at the time of receipt of
+ * a command from the initiator is a feature only of Fibre Channel.
+ *
+ * The CDFL_BIDIR is in anticipation of the adoption of some newer
+ * features required by OSD.
+ *
+ * The principle selector for MD layer to know whether data is to
+ * be transferred in any QOUT_TMD_CONT call is cd_xfrlen- the
+ * flags CDFH_DATA_IN and CDFH_DATA_OUT define which direction.
+ */
+#define CDFL_SNSVALID 0x01 /* sense data (from f/w) good */
+#define CDFL_SENTSTATUS 0x02 /* last action sent status */
+#define CDFL_DATA_IN 0x04 /* target (us) -> initiator (them) */
+#define CDFL_DATA_OUT 0x08 /* initiator (them) -> target (us) */
+#define CDFL_BIDIR 0x0C /* bidirectional data */
#define CDFL_ERROR 0x10 /* last action ended in error */
-#define CDFL_BUSY 0x40 /* this command is not on a free list */
-#define CDFL_PRIVATE_0 0x80 /* private layer flags */
+#define CDFL_NODISC 0x20 /* disconnects disabled */
+#define CDFL_SENTSENSE 0x40 /* last action sent sense data */
+#define CDFL_BUSY 0x80 /* this command is not on a free list */
+#define CDFL_PRIVATE 0xFF000000 /* private layer flags */
-#define CDFH_SNSVALID 0x01 /* sense data valid */
+#define CDFH_SNSVALID 0x01 /* sense data (from outer layer) good */
#define CDFH_STSVALID 0x02 /* status valid */
-#define CDFH_NODATA 0x00 /* no data transfer expected */
#define CDFH_DATA_IN 0x04 /* target (us) -> initiator (them) */
#define CDFH_DATA_OUT 0x08 /* initiator (them) -> target (us) */
#define CDFH_DATA_MASK 0x0C /* mask to cover data direction */
-#define CDFH_PRIVATE_0 0x80 /* private layer flags */
+#define CDFH_PRIVATE 0xFF000000 /* private layer flags */
+
/*
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list