Date: Wed, 12 Feb 2003 02:41:51 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 25049 for review Message-ID: <200302121041.h1CAfpGE044794@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25049 Change 25049 by marcel@marcel_vaio on 2003/02/12 02:41:08 IFC @25046 Affected files ... .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/tty/share/man/man4/firewire.4#3 integrate .. //depot/projects/tty/share/man/man4/fwe.4#2 integrate .. //depot/projects/tty/share/man/man4/fwohci.4#2 integrate .. //depot/projects/tty/share/man/man4/sbp.4#3 integrate .. //depot/projects/tty/sys/geom/geom_int.h#3 integrate .. //depot/projects/tty/sys/geom/geom_subr.c#3 integrate .. //depot/projects/tty/sys/kern/subr_rman.c#2 integrate .. //depot/projects/tty/sys/pci/if_dc.c#3 integrate .. //depot/projects/tty/sys/sys/rman.h#2 integrate .. //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#2 integrate Differences ... ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.55 2003/01/23 22:28:53 wilko Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.56 2003/02/12 08:25:30 wilko Exp $ --> <sect1 id="support-proc"> <sect1info> @@ -818,7 +818,8 @@ <para>Not all VGA cards will work behind the PCI-PCI bridge. This manifests itself as no video at all. Workaround is to put the VGA card <quote>before</quote> the bridge, in - one of the 64 bit PCI slots.</para> + one of the 64 bit PCI slots. Graphics performance using a + 64 bit slot is generally substantially better.</para> <para>Both MX5 and MiataGL have an on-board sound chip, an ESS1888. It emulates a SoundBlaster and can be enabled by ==== //depot/projects/tty/share/man/man4/firewire.4#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/firewire.4,v 1.4 2003/02/05 06:41:19 simokawa Exp $ +.\" $FreeBSD: src/share/man/man4/firewire.4,v 1.5 2003/02/12 06:48:45 simokawa Exp $ .\" .Dd May 23, 2002 .Dt FIREWIRE 4 @@ -38,6 +38,10 @@ .Nm firewire .Nd IEEE1394 High-performance Serial Bus .Sh SYNOPSIS +.Cd "kldload firewire" +.Pp +or +.Pp .Cd "device firewire" .Cd "device fwohci" .Pp @@ -82,6 +86,7 @@ .Xr fwcontrol 8 , .Xr fwe 4 , .Xr fwohci 4 , +.Xr kldload 8 , .Xr pci 4 , .Xr sbp 4 , .Xr sysctl 8 @@ -101,3 +106,6 @@ for the .Fx project. +.Pp +.Sh BUGS +See fwohci(4) for security note. ==== //depot/projects/tty/share/man/man4/fwe.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/fwe.4,v 1.2 2002/12/10 14:21:55 ru Exp $ +.\" $FreeBSD: src/share/man/man4/fwe.4,v 1.3 2003/02/12 06:48:45 simokawa Exp $ .\" .\" .Dd November 8, 2002 @@ -32,6 +32,11 @@ .Nm fwe .Nd Ethernet emulation driver for FireWire .Sh SYNOPSIS +.Cd "kldload firewire" +.Cd "kldload if_fwe" +.Pp +or +.Pp .Cd "device fwe" .Cd "device firewire" .Cd "device fwohci" @@ -69,6 +74,7 @@ .Xr arp 4 , .Xr firewire 4 , .Xr fwohci 4 , +.Xr kldload 8 , .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , ==== //depot/projects/tty/share/man/man4/fwohci.4#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/fwohci.4,v 1.3 2003/01/25 15:24:59 simokawa Exp $ +.\" $FreeBSD: src/share/man/man4/fwohci.4,v 1.4 2003/02/12 06:48:45 simokawa Exp $ .\" .\" .Dd April 10, 2000 @@ -39,6 +39,10 @@ .Nm fwohci .Nd OHCI firewire chipset device driver .Sh SYNOPSIS +.Cd "kldload firewire" +.Pp +or +.Pp .Cd "device fwohci" .Cd "device firewire" .Sh DESCRIPTION @@ -63,6 +67,7 @@ .Xr firewire 4 , .Xr fwcontrol 8 , .Xr fwe 4 , +.Xr kldload 8 , .Xr sbp 4 .Sh HISTORY The @@ -76,3 +81,11 @@ .An Katsushi Kobayashi and .An Hidetoshi Shimokawa . +.Pp +.Sh BUGS +The driver allows physical access from any nodes on the bus by default. +This means that any devices on the bus can read and modify any memory space +which can be accessed by IEEE 1394 OHCI chip. It is allowed mostly +for sbp(4) devices. This should be changed to allow it only for specific +devices. Anyway FireWire is a bus and not expected to be connected with +un-trustable devices because a node can monitor all the traffic. ==== //depot/projects/tty/share/man/man4/sbp.4#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sbp.4,v 1.4 2003/02/05 06:41:19 simokawa Exp $ +.\" $FreeBSD: src/share/man/man4/sbp.4,v 1.5 2003/02/12 06:48:45 simokawa Exp $ .\" .Dd May 20, 2002 .Dt SBP 4 @@ -38,6 +38,12 @@ .Nm sbp .Nd Serial Bus Protocol 2 (SBP-2) Mass Storage Devices driver .Sh SYNOPSIS +.Cd "kldload firewire" +.Cd "kldload cam" +.Cd "kldload sbp" +.Pp +or +.Pp .Cd "device sbp" .Cd "device firewire" .Cd "device scbus" @@ -56,6 +62,7 @@ .Xr camcontrol 8 , .Xr firewire 4 , .Xr fwcontrol 8 , +.Xr kldload 8 , .Xr sysctl 8 .Sh AUTHORS .An -nosplit ==== //depot/projects/tty/sys/geom/geom_int.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_int.h,v 1.10 2003/02/08 13:03:57 phk Exp $ + * $FreeBSD: src/sys/geom/geom_int.h,v 1.11 2003/02/12 09:48:27 phk Exp $ */ LIST_HEAD(class_list_head, g_class); @@ -42,10 +42,13 @@ extern struct event_tailq_head events; extern int g_collectstats; extern int g_debugflags; -/* 1 G_T_TOPOLOGY */ -/* 2 G_T_BIO */ -/* 4 G_T_ACCESS */ -/* 8 enable sanity checks */ +/* + * 1 G_T_TOPOLOGY + * 2 G_T_BIO + * 4 G_T_ACCESS + * 8 enable sanity checks + * 16 Allow footshooting on rank#1 providers + */ /* * Various internal actions are tracked by tagging g_event[s] onto ==== //depot/projects/tty/sys/geom/geom_subr.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_subr.c,v 1.29 2003/02/08 13:03:57 phk Exp $ + * $FreeBSD: src/sys/geom/geom_subr.c,v 1.30 2003/02/12 09:48:27 phk Exp $ */ @@ -418,14 +418,17 @@ pp->acr, pp->acw, pp->ace, pp, pp->name); + /* If foot-shooting is enabled, any open on rank#1 is OK */ + if ((g_debugflags & 16) && pp->geom->rank == 1) + ; /* If we try exclusive but already write: fail */ - if (dce > 0 && pw > 0) + else if (dce > 0 && pw > 0) return (EPERM); /* If we try write but already exclusive: fail */ - if (dcw > 0 && pe > 0) + else if (dcw > 0 && pe > 0) return (EPERM); /* If we try to open more but provider is error'ed: fail */ - if ((dcr > 0 || dcw > 0 || dce > 0) && pp->error != 0) + else if ((dcr > 0 || dcw > 0 || dce > 0) && pp->error != 0) return (pp->error); /* Ok then... */ ==== //depot/projects/tty/sys/kern/subr_rman.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_rman.c,v 1.28 2003/01/21 17:02:21 tmm Exp $ + * $FreeBSD: src/sys/kern/subr_rman.c,v 1.29 2003/02/12 07:00:59 imp Exp $ */ /* @@ -685,3 +685,9 @@ { return (r->r_rid); } + +struct device * +rman_get_device(struct resource *r) +{ + return (r->r_dev); +} ==== //depot/projects/tty/sys/pci/if_dc.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_dc.c,v 1.92 2003/02/07 23:12:51 mbr Exp $ + * $FreeBSD: src/sys/pci/if_dc.c,v 1.93 2003/02/12 07:16:15 imp Exp $ */ /* @@ -137,7 +137,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_dc.c,v 1.92 2003/02/07 23:12:51 mbr Exp $"; + "$FreeBSD: src/sys/pci/if_dc.c,v 1.93 2003/02/12 07:16:15 imp Exp $"; #endif /* @@ -1955,7 +1955,7 @@ sc->dc_info = dc_devtype(dev); revision = pci_read_config(dev, DC_PCI_CFRV, 4) & 0x000000FF; - /* Get the eeprom width, but PNIC and XIRCOM have no eeprom */ + /* Get the eeprom width, but PNIC and XIRCOM have diff eeprom */ if (sc->dc_info->dc_did != DC_DEVICEID_82C168 && sc->dc_info->dc_did != DC_DEVICEID_X3201) dc_eeprom_width(sc); ==== //depot/projects/tty/sys/sys/rman.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/rman.h,v 1.18 2002/11/27 03:55:22 imp Exp $ + * $FreeBSD: src/sys/sys/rman.h,v 1.19 2003/02/12 07:00:59 imp Exp $ */ #ifndef _SYS_RMAN_H_ @@ -134,6 +134,7 @@ u_long rman_get_start(struct resource *_r); u_long rman_get_end(struct resource *_r); +struct device *rman_get_device(struct resource *); u_long rman_get_size(struct resource *_r); u_int rman_get_flags(struct resource *_r); void rman_set_virtual(struct resource *_r, void *_v); ==== //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#2 (text+ko) ==== @@ -26,7 +26,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/tools/tools/tinderbox/tinderbox.pl,v 1.1 2003/02/11 22:17:49 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.2 2003/02/12 09:13:36 des Exp $ # use strict; @@ -265,7 +265,7 @@ # Set defaults $arch = `/usr/bin/uname -m`; chomp($arch); - $branch = "HEAD"; + $branch = "CURRENT"; $jobs = 0; $repository = "/home/ncvs"; $sandbox = "$ENV{'HOME'}/tinderbox"; @@ -376,7 +376,7 @@ } else { push(@cvsargs, "checkout", "-P"); }; - push(@cvsargs, "-r$branch") + push(@cvsargs, ($branch eq 'CURRENT') ? "-A" : "-r$branch") if defined($branch); push(@cvsargs, "-D$date") if defined($date); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302121041.h1CAfpGE044794>