Date: Mon, 15 Mar 2004 03:16:44 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49017 for review Message-ID: <200403151116.i2FBGifJ035044@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49017 Change 49017 by rwatson@rwatson_paprika on 2004/03/15 03:16:22 - More NULL/0 tweaks. - Gsc, if_le, if_rdp, isa_compat, spigot removed; more axing cleanup for other isa_compat drivers. - Giant goes back on pfs hooks. - Loop back if_tap global locking. - vslock/unlock restoration. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#7 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#5 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#3 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#11 integrate .. //depot/projects/netperf_socket/sys/i386/include/gsc.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/spigot.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/README.le#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/gsc.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/gscreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ic/am7990.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ic/lemac.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_le.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_rdp.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_rdpreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/isa_compat.c#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/isa_device.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/pcf.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spigot.c#3 delete .. //depot/projects/netperf_socket/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_extern.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.403 2004/02/02 00:54:59 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.404 2004/03/15 00:49:39 obrien Exp $ machine amd64 cpu HAMMER @@ -188,7 +188,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.34 2004/02/13 15:26:22 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.35 2004/03/14 09:41:57 nyan Exp $ PROG= loader.sym INTERNALPROG= @@ -85,7 +85,10 @@ FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif -DPADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} ${LIBSTAND} -LDADD= ${BTXCRT} ${LIBFICL} ${LIBPC98} -lstand +# XXX crt0.o needs to be first for pxeboot(8) to work +OBJS= ${BTXCRT} + +DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBPC98} -lstand .include <bsd.prog.mk> ==== //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.16 2003/09/08 09:11:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.17 2004/03/14 09:43:15 nyan Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -112,7 +112,7 @@ /* * Special handling for PXE and CD booting. */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { /* * We only want the PXE disk to try to init itself in the below * walk through devsw if we actually booted off of PXE. @@ -173,7 +173,7 @@ new_currdev.d_dev = &biosdisk; /* new-style boot loaders such as pxeldr and cdldr */ - if (kargs->bootinfo == NULL) { + if (kargs->bootinfo == 0) { if ((kargs->bootflags & KARGS_FLAGS_CD) != 0) { /* we are booting from a CD with cdboot */ new_currdev.d_dev = &bioscd; ==== //depot/projects/netperf_socket/sys/conf/files.i386#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.473 2004/03/14 06:48:35 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.478 2004/03/14 23:03:56 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -264,13 +264,8 @@ i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gsc.c count gsc i386/isa/if_el.c count el -i386/isa/if_le.c count le -i386/isa/if_rdp.c count rdp i386/isa/isa.c optional isa -i386/isa/isa_compat.c optional isa compat_oldisa \ - warning "Old ISA driver compatibility shims present." i386/isa/isa_dma.c optional isa i386/isa/mse.c optional mse i386/isa/nmi.c standard @@ -285,7 +280,6 @@ i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spic.c optional spic -i386/isa/spigot.c count spigot i386/isa/spkr.c optional speaker i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux ==== //depot/projects/netperf_socket/sys/conf/files.pc98#5 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.288 2004/03/14 06:48:35 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.289 2004/03/14 23:03:56 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -203,8 +203,6 @@ i386/isa/elink.c optional ep i386/isa/elink.c optional ie i386/isa/isa.c optional isa -i386/isa/isa_compat.c optional isa compat_oldisa \ - warning "Old ISA driver compatibility shims present." i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine ==== //depot/projects/netperf_socket/sys/conf/options.i386#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.211 2004/01/25 15:27:23 bde Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.212 2004/03/14 23:03:56 imp Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h -COMPAT_OLDISA DISABLE_PG_G opt_pmap.h DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/netperf_socket/sys/conf/options.pc98#3 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.174 2004/01/26 12:28:40 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.175 2004/03/14 23:03:56 imp Exp $ # Options specific to the pc98 platform kernels AUTO_EOI_1 opt_auto_eoi.h BROKEN_KEYBOARD_RESET opt_reset.h -COMPAT_OLDISA DISABLE_PG_G opt_pmap.h DISABLE_PSE opt_pmap.h I586_PMC_GUPROF opt_i586_guprof.h ==== //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.131 2004/03/14 08:43:55 ru Exp $"); /* * Modified from the FreeBSD 1.1.5.1 version by: @@ -60,9 +60,6 @@ * <mdodd@FreeBSD.org> */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ep/if_ep.c,v 1.130 2004/03/14 07:12:21 mdodd Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.168 2004/03/14 21:56:50 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -715,6 +715,7 @@ /* Handspring, Inc. */ product HANDSPRING VISOR 0x0100 Handspring Visor product HANDSPRING TREO 0x0200 Handspring Treo +product HANDSPRING TREO600 0x0300 Handspring Treo 600 /* Hauppauge Computer Works */ product HAUPPAUGE WINTV_USB_FM 0x4d12 WinTV USB FM ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#7 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.175 2004/03/14 21:57:35 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.168 2004/03/14 21:56:50 joe Exp */ /* @@ -722,6 +722,7 @@ /* Handspring, Inc. */ #define USB_PRODUCT_HANDSPRING_VISOR 0x0100 /* Handspring Visor */ #define USB_PRODUCT_HANDSPRING_TREO 0x0200 /* Handspring Treo */ +#define USB_PRODUCT_HANDSPRING_TREO600 0x0300 /* Handspring Treo 600 */ /* Hauppauge Computer Works */ #define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV USB FM */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#7 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.175 2004/03/14 21:57:35 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.168 2004/03/14 21:56:50 joe Exp */ /* @@ -1204,6 +1204,12 @@ "Handspring Treo", }, { + USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600, + 0, + "Handspring", + "Handspring Treo 600", + }, + { USB_VENDOR_HAUPPAUGE, USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM, 0, "Hauppauge Computer Works", ==== //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.17 2004/01/03 15:30:11 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.18 2004/03/14 21:56:51 joe Exp $ */ /* Also already merged from NetBSD: * $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $ @@ -210,6 +210,7 @@ static const struct uvisor_type uvisor_devs[] = { {{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR }, 0 }, {{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO }, PALM4 }, + {{ USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600 }, PALM4 }, {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M500 }, PALM4 }, {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M505 }, PALM4 }, {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M515 }, PALM4 }, ==== //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.118 2004/02/21 22:47:19 bde Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.119 2004/03/14 23:28:12 rwatson Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -398,7 +398,7 @@ /* XXX - We should probably check more values here */ if (!pmp->pm_BytesPerSec || !SecPerClust - || !pmp->pm_Heads || pmp->pm_Heads > 255 + || !pmp->pm_Heads #ifdef PC98 || !pmp->pm_SecPerTrack || pmp->pm_SecPerTrack > 255) { #else ==== //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#2 (text+ko) ==== @@ -25,7 +25,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/sys/fs/pseudofs/pseudofs_vncache.c,v 1.24 2003/10/05 02:43:30 jeff Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.25 2004/03/14 15:57:45 green Exp $ */ #include <sys/param.h> @@ -222,6 +222,7 @@ { struct pfs_vdata *pvd, *prev; + mtx_lock(&Giant); mtx_lock(&pfs_vncache_mutex); /* * The double loop is necessary because vgone() indirectly @@ -239,6 +240,7 @@ break; } mtx_unlock(&pfs_vncache_mutex); + mtx_unlock(&Giant); } /* ==== //depot/projects/netperf_socket/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.397 2004/01/29 21:24:53 schweikh Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.398 2004/03/15 00:49:40 obrien Exp $ machine i386 cpu I486_CPU @@ -201,7 +201,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/netperf_socket/sys/i386/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.11 2002/12/05 22:49:47 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.12 2004/03/14 22:38:18 imp Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -81,11 +81,6 @@ hint.fe.0.at="isa" hint.fe.0.disabled="1" hint.fe.0.port="0x300" -hint.le.0.at="isa" -hint.le.0.disabled="1" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" hint.lnc.0.at="isa" hint.lnc.0.disabled="1" hint.lnc.0.port="0x280" ==== //depot/projects/netperf_socket/sys/i386/conf/NOTES#11 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1141 2004/03/14 06:48:34 imp Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1147 2004/03/14 23:03:57 imp Exp $ # # @@ -310,7 +310,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options COMPAT_OLDISA #Use ISA shims and glue for old drivers options AUTO_EOI_1 #options AUTO_EOI_2 @@ -506,14 +505,11 @@ # el: 3Com 3C501 (slow!) # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress -# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100, -# DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, # OC-3141, OC-3540 and OC-3250. -# rdp: RealTek RTL 8002-based pocket ethernet adapters # sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) # wl: Lucent Wavelan (ISA card only). @@ -551,21 +547,11 @@ hint.ie.2.port="0x300" hint.ie.2.irq="5" hint.ie.2.maddr="0xd0000" -device le 1 -hint.le.0.at="isa" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" device lnc hint.lnc.0.at="isa" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" -device rdp 1 -hint.rdp.0.at="isa" -hint.rdp.0.port="0x378" -hint.rdp.0.irq="7" -hint.rdp.0.flags="2" device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -632,27 +618,14 @@ # # apm: Laptop Advanced Power Management (experimental) # pmtimer: Timer device driver for power management events (APM or ACPI) -# spigot: The Creative Labs Video Spigot video-acquisition board # cy: Cyclades serial driver # digi: Digiboard driver -# gsc: Genius GS-4500 hand scanner. # spic: Sony Programmable I/O controller (VAIO notebooks) # Notes on APM # The flags takes the following meaning for apm0: # 0x0020 Statclock is broken. -# Notes on the spigot: -# The video spigot is at 0xad6. This port address can not be changed. -# The irq values may only be 10, 11, or 15 -# I/O memory is an 8kb region. Possible values are: -# 0a0000, 0a2000, ..., 0fffff, f00000, f02000, ..., ffffff -# The start address must be on an even boundary. -# Add the following option if you want to allow non-root users to be able -# to access the spigot. This option is not secure because it allows users -# direct access to the I/O page. -# options SPIGOT_UNSECURE - # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. # The Rev 1 host cards use a 64K chunk, on a 32K boundary. @@ -671,16 +644,12 @@ # is the only thing truly supported, but apparently a fair percentage # of the Vaio extra features are controlled by this device. -device spigot 1 -hint.spigot.0.at="isa" -hint.spigot.0.port="0xad6" -hint.spigot.0.irq="15" -hint.spigot.0.maddr="0xee000" device apm hint.apm.0.flags="0x20" device pmtimer # Adjust system timer at wakeup time -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#The Cy driver is commented out until imp can move it to dev/cy +#device cy 1 +#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared hint.cy.0.at="isa" hint.cy.0.irq="10" hint.cy.0.maddr="0xd4000" @@ -697,10 +666,6 @@ device digi_Xe device digi_Xem device digi_Xr -device gsc 1 -hint.gsc.0.at="isa" -hint.gsc.0.port="0x270" -hint.gsc.0.drq="3" device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" ==== //depot/projects/netperf_socket/sys/i386/isa/pcf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/isa/pcf.c,v 1.21 2003/06/20 07:22:54 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/pcf.c,v 1.22 2004/03/14 23:03:57 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,8 +40,6 @@ #include <isa/isareg.h> #include <isa/isavar.h> -#include <i386/isa/isa_device.h> - #include <dev/iicbus/iiconf.h> #include "iicbus_if.h" ==== //depot/projects/netperf_socket/sys/kern/kern_ntptime.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.53 2004/01/24 21:48:43 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.54 2004/03/14 15:23:05 phk Exp $"); #include "opt_ntp.h" @@ -50,10 +50,10 @@ /* * Single-precision macros for 64-bit machines */ -typedef long long l_fp; +typedef int64_t l_fp; #define L_ADD(v, u) ((v) += (u)) #define L_SUB(v, u) ((v) -= (u)) -#define L_ADDHI(v, a) ((v) += (long long)(a) << 32) +#define L_ADDHI(v, a) ((v) += (int64_t)(a) << 32) #define L_NEG(v) ((v) = -(v)) #define L_RSHIFT(v, n) \ do { \ @@ -65,7 +65,7 @@ #define L_MPY(v, a) ((v) *= (a)) #define L_CLR(v) ((v) = 0) #define L_ISNEG(v) ((v) < 0) -#define L_LINT(v, a) ((v) = (long long)(a) << 32) +#define L_LINT(v, a) ((v) = (int64_t)(a) << 32) #define L_GINT(v) ((v) < 0 ? -(-(v) >> 32) : (v) >> 32) /* @@ -357,8 +357,13 @@ L_LINT(time_freq, MAXFREQ); else if (freq < -MAXFREQ) L_LINT(time_freq, -MAXFREQ); - else - L_LINT(time_freq, freq); + else { + /* + * ntv.freq is [PPM * 2^16] = [us/s * 2^16] + * time_freq is [ns/s * 2^32] + */ + time_freq = ntv.freq * 1000LL * 65536LL; + } #ifdef PPS_SYNC pps_freq = time_freq; #endif /* PPS_SYNC */ @@ -548,10 +553,8 @@ tickrate = 500; else if (time_adjtime < -500) tickrate = -500; - else if (time_adjtime != 0) + else tickrate = time_adjtime; - else - tickrate = 0; /* GCC sucks! */ time_adjtime -= tickrate; L_LINT(ftemp, tickrate * 1000); L_ADD(time_adj, ftemp); ==== //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.152 2004/03/05 22:03:11 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.153 2004/03/15 06:42:40 truckman Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1000,8 +1000,7 @@ error = sysctl_root(0, name, namelen, &req); if (req.lock == REQ_WIRED) - vsunlock(req.td, (vm_offset_t)req.oldptr, - (vm_size_t)req.wiredlen); + vsunlock(req.oldptr, req.wiredlen); SYSCTL_UNLOCK(); @@ -1103,8 +1102,7 @@ ret = 0; if (req->lock == REQ_LOCKED && req->oldptr && req->oldfunc == sysctl_old_user) { - ret = vslock(req->td, (vm_offset_t)req->oldptr, - (vm_size_t)wiredlen); + ret = vslock(req->oldptr, wiredlen); if (ret == 0) { req->lock = REQ_WIRED; req->wiredlen = wiredlen; @@ -1320,8 +1318,7 @@ req = req2; if (req.lock == REQ_WIRED) - vsunlock(req.td, (vm_offset_t)req.oldptr, - (vm_size_t)req.wiredlen); + vsunlock(req.oldptr, req.wiredlen); SYSCTL_UNLOCK(); ==== //depot/projects/netperf_socket/sys/net/if_tap.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ /* - * $FreeBSD: src/sys/net/if_tap.c,v 1.38 2004/03/11 12:58:55 phk Exp $ + * $FreeBSD: src/sys/net/if_tap.c,v 1.39 2004/03/15 01:52:00 rwatson Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -108,6 +108,12 @@ .d_name = CDEV_NAME, }; +/* + * All global variables in if_tap.c are locked with tapmtx, with the + * exception of tapdebug, which is accessed unlocked; tapclones is + * static at runtime. + */ +static struct mtx tapmtx; static int tapdebug = 0; /* debug flag */ static SLIST_HEAD(, tap_softc) taphead; /* first device */ static struct clonedevs *tapclones; @@ -138,23 +144,38 @@ /* intitialize device */ + mtx_init(&tapmtx, "tapmtx", NULL, MTX_DEF); SLIST_INIT(&taphead); clone_setup(&tapclones); eh_tag = EVENTHANDLER_REGISTER(dev_clone, tapclone, 0, 1000); - if (eh_tag == NULL) + if (eh_tag == NULL) { + mtx_destroy(&tapmtx); return (ENOMEM); + } return (0); case MOD_UNLOAD: - SLIST_FOREACH(tp, &taphead, tap_next) - if (tp->tap_flags & TAP_OPEN) + /* + * The EBUSY algorithm here can't quite atomically + * guarantee that this is race-free since we have to + * release the tap mtx to deregister the clone handler. + */ + mtx_lock(&tapmtx); + SLIST_FOREACH(tp, &taphead, tap_next) { + if (tp->tap_flags & TAP_OPEN) { + mtx_unlock(&tapmtx); return (EBUSY); + } + } + mtx_unlock(&tapmtx); EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); + mtx_lock(&tapmtx); while ((tp = SLIST_FIRST(&taphead)) != NULL) { SLIST_REMOVE_HEAD(&taphead, tap_next); + mtx_unlock(&tapmtx); ifp = &tp->tap_if; @@ -169,7 +190,9 @@ splx(s); free(tp, M_TAP); + mtx_lock(&tapmtx); } + mtx_unlock(&tapmtx); clone_cleanup(&tapclones); break; @@ -246,7 +269,9 @@ /* allocate driver storage and create device */ MALLOC(tp, struct tap_softc *, sizeof(*tp), M_TAP, M_WAITOK | M_ZERO); + mtx_lock(&tapmtx); SLIST_INSERT_HEAD(&taphead, tp, tap_next); + mtx_unlock(&tapmtx); unit = dev2unit(dev); ==== //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.243 2004/03/07 04:07:57 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.244 2004/03/15 00:49:40 obrien Exp $ machine pc98 #cpu I386_CPU # Do not enable with other cpu types @@ -186,7 +186,7 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x and SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device ti # Alteon Networks Tigon I/II gigabit ethernet device tl # Texas Instruments ThunderLAN ==== //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.16 2002/12/03 20:20:44 sos Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC.hints,v 1.17 2004/03/14 23:02:07 imp Exp $ hint.atacbus.0.at="isa" hint.atacbus.0.port="0x640" @@ -17,17 +17,17 @@ hint.fd.3.at="fdc0" hint.fd.3.drive="3" -hint.wdc.0.at="isa" -hint.wdc.0.port="0x640" -hint.wdc.0.irq="9" -hint.wd.0.at="wdc0" -hint.wd.0.drive="0" -hint.wd.1.at="wdc0" -hint.wd.1.drive="2" -hint.wd.2.at="wdc0" -hint.wd.2.drive="1" -hint.wd.3.at="wdc0" -hint.wd.3.drive="3" +#hint.wdc.0.at="isa" +#hint.wdc.0.port="0x640" +#hint.wdc.0.irq="9" +#hint.wd.0.at="wdc0" +#hint.wd.0.drive="0" +#hint.wd.1.at="wdc0" +#hint.wd.1.drive="2" +#hint.wd.2.at="wdc0" +#hint.wd.2.drive="1" +#hint.wd.3.at="wdc0" +#hint.wd.3.drive="3" # PC-9801-100 hint.aic.0.at="isa" @@ -36,11 +36,11 @@ hint.aic.0.flags="0x10000" # PC-9801-92 -hint.bs.0.at="isa" -hint.bs.0.port="0xCC0" -hint.bs.0.irq="5" -hint.bs.0.drq="3" -hint.bs.0.flags="0" +#hint.bs.0.at="isa" +#hint.bs.0.port="0xCC0" +#hint.bs.0.irq="5" +#hint.bs.0.drq="3" +#hint.bs.0.flags="0" # SC-98 #hint.bs.0.at="isa" #hint.bs.0.port="0xCC0" ==== //depot/projects/netperf_socket/sys/pc98/conf/NOTES#4 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.27 2004/03/07 05:38:20 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.29 2004/03/15 10:39:37 imp Exp $ # # @@ -264,7 +264,6 @@ # reset the CPU for reboot. This is needed on some systems with broken # keyboard controllers. -options COMPAT_OLDISA #Use ISA shims and glue for old drivers options AUTO_EOI_1 options MAXMEM=(128*1024) @@ -459,28 +458,11 @@ # pmtimer: Timer device driver for power management events (APM or ACPI) # cy: Cyclades serial driver # digi: Digiboard driver -# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based) -# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent) # Notes on APM # The flags takes the following meaning for apm0: # 0x0020 Statclock is broken. -# Notes on the Stallion stl and stli drivers: -# See src/i386/isa/README.stl for complete instructions. -# This is version 0.0.5alpha, unsupported by Stallion. -# The stl driver has a secondary IO port hard coded at 0x280. You need -# to change src/i386/isa/stallion.c if you reconfigure this on the boards. -# The "flags" and "msize" settings on the stli driver depend on the board: -# EasyConnection 8/64 ISA: flags 23 msize 0x1000 -# EasyConnection 8/64 EISA: flags 24 msize 0x10000 -# EasyConnection 8/64 MCA: flags 25 msize 0x1000 -# ONboard ISA: flags 4 msize 0x10000 -# ONboard EISA: flags 7 msize 0x10000 -# ONboard MCA: flags 3 msize 0x10000 -# Brumby: flags 2 msize 0x4000 -# Stallion: flags 1 msize 0x10000 - device apm hint.apm.0.flags="0x20" device canbus @@ -489,8 +471,8 @@ hint.pmc.0.at="isa" hint.pmc.0.port="0x8f0" device pmtimer # Adjust system timer at wakeup time -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#device cy 1 +#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi # BIOS & FEP/OS components of device digi. device digi_CX @@ -503,8 +485,6 @@ device olpt hint.olpt.0.at="isa" hint.olpt.0.port="0x040" -device stl -device stli # # Laptop/Notebook options: ==== //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.134 2003/11/04 13:15:12 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.135 2004/03/15 10:39:01 imp Exp $ */ /* @@ -85,7 +85,6 @@ #include <i386/isa/icu.h> #include <pc98/pc98/pc98.h> #include <pc98/pc98/pc98_machdep.h> -#include <i386/isa/isa_device.h> #ifdef DEV_ISA #include <isa/isavar.h> #endif ==== //depot/projects/netperf_socket/sys/vm/vm_extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_extern.h,v 1.70 2004/03/05 22:03:11 truckman Exp $ + * $FreeBSD: src/sys/vm/vm_extern.h,v 1.71 2004/03/15 06:42:40 truckman Exp $ */ #ifndef _VM_EXTERN_H_ @@ -86,8 +86,8 @@ void vmspace_free(struct vmspace *); void vmspace_exitfree(struct proc *); void vnode_pager_setsize(struct vnode *, vm_ooffset_t); -int vslock(struct thread *, vm_offset_t, vm_size_t); -int vsunlock(struct thread *, vm_offset_t, vm_size_t); +int vslock(void *, size_t); +void vsunlock(void *, size_t); void vm_object_print(/* db_expr_t */ long, boolean_t, /* db_expr_t */ long, char *); int vm_fault_quick(caddr_t v, int prot); ==== //depot/projects/netperf_socket/sys/vm/vm_glue.c#5 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.192 2004/03/07 21:06:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.195 2004/03/15 09:11:23 truckman Exp $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -183,39 +183,29 @@ return (rv == TRUE); } -/* - * MPSAFE - */ int -vslock(td, addr, size) - struct thread *td; - vm_offset_t addr; - vm_size_t size; +vslock(void *addr, size_t len) { - vm_offset_t start, end; - struct proc *proc = td->td_proc; - int error, npages; + vm_offset_t end, last, start; + vm_size_t npages; + int error; - start = trunc_page(addr); - end = round_page(addr + size); - - /* disable wrap around */ - if (end <= start) + last = (vm_offset_t)addr + len; + start = trunc_page((vm_offset_t)addr); + end = round_page(last); + if (last < (vm_offset_t)addr || end < (vm_offset_t)addr) return (EINVAL); - npages = atop(end - start); - if (npages > vm_page_max_wired) return (ENOMEM); - - PROC_LOCK(proc); - if (npages + pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map)) > - atop(lim_cur(proc, RLIMIT_MEMLOCK))) { - PROC_UNLOCK(proc); + PROC_LOCK(curproc); + if (ptoa(npages + + pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))) > + lim_cur(curproc, RLIMIT_MEMLOCK)) { + PROC_UNLOCK(curproc); return (ENOMEM); } - PROC_UNLOCK(proc); - + PROC_UNLOCK(curproc); #if 0 /* * XXX - not yet @@ -229,36 +219,23 @@ if (npages + cnt.v_wire_count > vm_page_max_wired) return (EAGAIN); #endif - - error = vm_map_wire(&proc->p_vmspace->vm_map, start, end, - VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES); - - /* EINVAL is probably a better error to return than ENOMEM */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403151116.i2FBGifJ035044>