Date: Tue, 6 Apr 2004 20:45:17 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50556 for review Message-ID: <200404070345.i373jHS9063708@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50556 Change 50556 by rwatson@rwatson_tislabs on 2004/04/06 20:44:50 Integrate netperf_socket: - Lots of clause three license changes. - More NDISery. - MUTEX_WAKE_ALL, turnstile_broadcast(). - 802.11 uses the right MALLOC bucket; many new 802.11 bits. - if_bge PXE fixes. - cy uses newbus. - cv_waiters added. - callout_stop_safe(). - lgetfh(). - Lots of 32-bit ABI on 64-bit platform fixes. - pf builds with NOINET6. - if_gif recursion checks using mtags rather than gif_called. - Loop back of nfs.h SLP_ constant comments. - if_vr polling support. - MAP_SHARED protection made more liberal. - sf_buf_free() instead of various vm_pager_{map,unmap}_page(). - avail_start gone. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/param.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pmap.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/asm.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/exec.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/frame.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/proc.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/psl.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/reg.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/segments.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/signal.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/trap.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/tss.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/_limits.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/signal.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/netperf_socket/sys/conf/options#8 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#14 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/cy.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_clock.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mib.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_time.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_clock.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_log.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_param.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prf.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_scanf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sys_generic.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#6 integrate .. //depot/projects/netperf_socket/sys/kern/tty_compat.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty_conf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_proto.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_export.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_init.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vnode_if.src#2 integrate .. //depot/projects/netperf_socket/sys/modules/pf/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pfsync/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.h#2 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.c#3 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/netperf_socket/sys/pci/cy_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#11 integrate .. //depot/projects/netperf_socket/sys/pci/if_stereg.h#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/netperf_socket/sys/sys/callout.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/condvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#6 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/turnstile.h#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/device_pager.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/pmap.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_extern.h#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_init.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_meter.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pager.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pager.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_param.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_unix.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.h#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/clock.c#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -42,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.35 2003/11/13 09:24:21 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.36 2004/04/05 21:00:49 imp Exp $"); #include "opt_clock.h" ==== //depot/projects/netperf_socket/sys/alpha/alpha/genassym.c#2 (text+ko) ==== @@ -13,10 +13,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -37,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.43 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.44 2004/04/05 21:00:49 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#3 (text+ko) ==== @@ -16,10 +16,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -41,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.47 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.48 2004/04/05 21:00:49 imp Exp $"); /* * Memory special file ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.141 2004/04/05 00:37:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.142 2004/04/05 04:07:58 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -301,7 +301,6 @@ */ struct pmap kernel_pmap_store; -vm_offset_t avail_start; /* PA of first available physical page */ vm_offset_t avail_end; /* PA of last available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -512,7 +511,6 @@ Lev2map[i] = newpte; } - avail_start = phys_avail[0]; for (i = 0; phys_avail[i+2]; i+= 2) ; avail_end = phys_avail[i+1]; ==== //depot/projects/netperf_socket/sys/alpha/alpha/sys_machdep.c#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.26 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.27 2004/04/05 21:00:49 imp Exp $"); #include "opt_mac.h" ==== //depot/projects/netperf_socket/sys/alpha/alpha/uio_machdep.c#2 (text+ko) ==== @@ -16,10 +16,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -40,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.1 2004/03/20 21:06:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.2 2004/04/05 21:00:49 imp Exp $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/netperf_socket/sys/alpha/include/_limits.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -32,7 +28,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.14 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.15 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE__LIMITS_H_ ==== //depot/projects/netperf_socket/sys/alpha/include/cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.36 2003/08/17 06:42:07 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.37 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -18,10 +18,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/netperf_socket/sys/alpha/include/endian.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -32,7 +28,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.14 2003/08/03 07:50:18 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.15 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_ENDIAN_H_ ==== //depot/projects/netperf_socket/sys/alpha/include/float.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/float.h,v 1.4 2003/02/08 20:37:54 mike Exp $ */ +/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -13,10 +13,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/netperf_socket/sys/alpha/include/ieee.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/ieee.h,v 1.2 1999/08/28 00:38:44 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/ieee.h,v 1.3 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */ /* @@ -9,11 +9,6 @@ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and * contributed to Berkeley. * - * All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Lawrence Berkeley Laboratory. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -22,10 +17,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -33,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.5 2000/05/06 18:18:31 jlemon Exp $ + * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.6 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ ==== //depot/projects/netperf_socket/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -32,7 +28,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.12 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.13 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_LIMITS_H_ ==== //depot/projects/netperf_socket/sys/alpha/include/param.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.32 2003/07/31 01:31:31 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.33 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -18,10 +18,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/netperf_socket/sys/alpha/include/pmap.h#4 (text+ko) ==== @@ -14,10 +14,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -43,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.26 2004/04/03 21:38:20 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.28 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -209,7 +205,6 @@ #ifdef _KERNEL extern vm_offset_t avail_end; -extern vm_offset_t avail_start; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/netperf_socket/sys/alpha/include/ptrace.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.10 2002/03/16 00:25:50 des Exp $ + * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.11 2004/04/05 21:00:50 imp Exp $ */ #ifndef _MACHINE_PTRACE_H_ ==== //depot/projects/netperf_socket/sys/alpha/include/sysarch.h#2 (text+ko) ==== @@ -10,10 +10,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -30,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.7 2004/01/09 16:52:08 nectar Exp $ + * $FreeBSD: src/sys/alpha/include/sysarch.h,v 1.8 2004/04/05 21:00:50 imp Exp $ */ /* ==== //depot/projects/netperf_socket/sys/alpha/include/vmparam.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.8 2002/11/01 03:34:51 jeff Exp $ */ +/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.9 2004/04/05 21:00:50 imp Exp $ */ /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */ #ifndef _ALPHA_VMPARAM_H #define _ALPHA_VMPARAM_H @@ -19,10 +19,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. ==== //depot/projects/netperf_socket/sys/alpha/isa/isa_dma.c#2 (text+ko) ==== @@ -13,10 +13,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -48,7 +44,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.10 2003/08/22 07:20:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.11 2004/04/05 21:00:51 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -11,10 +11,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -32,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.96 2003/12/06 23:19:47 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.97 2004/04/05 21:25:51 imp Exp $ */ /* ==== //depot/projects/netperf_socket/sys/amd64/amd64/autoconf.c#2 (text+ko) ==== @@ -13,10 +13,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -37,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.177 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.178 2004/04/05 21:25:51 imp Exp $"); /* * Setup the system to run on the current machine. ==== //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -14,10 +14,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -34,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.147 2004/02/06 20:38:39 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.148 2004/04/05 23:55:13 imp Exp $ */ #include <machine/asmacros.h> ==== //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.77 2004/02/05 17:35:28 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.78 2004/04/07 00:41:05 peter Exp $"); /* * Interface to new debugger. @@ -57,18 +57,6 @@ static jmp_buf db_global_jmpbuf; -static __inline u_short -rss(void) -{ - u_short ss; -#ifdef __GNUC__ - __asm __volatile("mov %%ss,%0" : "=r" (ss)); -#else - ss = 0; /* XXXX Fix for other compilers. */ -#endif - return ss; -} - /* * kdb_trap - field a TRACE or BPT trap */ ==== //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -11,10 +11,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.115 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.116 2004/04/05 21:25:51 imp Exp $ */ #include <machine/asmacros.h> ==== //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -11,10 +11,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -35,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.148 2004/01/28 23:55:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.149 2004/04/05 21:25:51 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -13,10 +13,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -37,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.152 2004/01/28 23:57:02 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.153 2004/04/05 21:25:51 imp Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.130 2004/03/25 03:38:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.131 2004/04/07 00:44:15 peter Exp $"); #include "opt_cpu.h" @@ -338,6 +338,21 @@ } static void +print_AMD_l2_assoc(int i) +{ + switch (i & 0x0f) { + case 0: printf(", disabled/not present\n"); break; + case 1: printf(", direct mapped\n"); break; + case 2: printf(", 2-way associative\n"); break; + case 4: printf(", 4-way associative\n"); break; + case 6: printf(", 8-way associative\n"); break; + case 8: printf(", 16-way associative\n"); break; + case 15: printf(", fully associative\n"); break; + default: printf(", reserved configuration\n"); break; + } +} + +static void print_AMD_info(void) { @@ -345,24 +360,59 @@ u_int regs[4]; do_cpuid(0x80000005, regs); - printf("Data TLB: %d entries", (regs[1] >> 16) & 0xff); + printf("L1 2MB data TLB: %d entries", (regs[0] >> 16) & 0xff); + print_AMD_assoc(regs[0] >> 24); + + printf("L1 2MB instruction TLB: %d entries", regs[0] & 0xff); + print_AMD_assoc((regs[0] >> 8) & 0xff); + + printf("L1 4KB data TLB: %d entries", (regs[1] >> 16) & 0xff); print_AMD_assoc(regs[1] >> 24); - printf("Instruction TLB: %d entries", regs[1] & 0xff); + + printf("L1 4KB instruction TLB: %d entries", regs[1] & 0xff); print_AMD_assoc((regs[1] >> 8) & 0xff); + printf("L1 data cache: %d kbytes", regs[2] >> 24); printf(", %d bytes/line", regs[2] & 0xff); printf(", %d lines/tag", (regs[2] >> 8) & 0xff); print_AMD_assoc((regs[2] >> 16) & 0xff); + printf("L1 instruction cache: %d kbytes", regs[3] >> 24); printf(", %d bytes/line", regs[3] & 0xff); printf(", %d lines/tag", (regs[3] >> 8) & 0xff); print_AMD_assoc((regs[3] >> 16) & 0xff); - if (cpu_exthigh >= 0x80000006) { /* K6-III only */ + + if (cpu_exthigh >= 0x80000006) { do_cpuid(0x80000006, regs); - printf("L2 internal cache: %d kbytes", regs[2] >> 16); + if ((regs[0] >> 16) != 0) { + printf("L2 2MB data TLB: %d entries", + (regs[0] >> 16) & 0xfff); + print_AMD_l2_assoc(regs[0] >> 28); + printf("L2 2MB instruction TLB: %d entries", + regs[0] & 0xfff); + print_AMD_l2_assoc((regs[0] >> 28) & 0xf); + } else { + printf("L2 2MB unified TLB: %d entries", + regs[0] & 0xfff); + print_AMD_l2_assoc((regs[0] >> 28) & 0xf); + } + if ((regs[1] >> 16) != 0) { + printf("L2 4KB data TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc(regs[1] >> 28); + + printf("L2 4KB instruction TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc((regs[1] >> 28) & 0xf); + } else { + printf("L2 4KB unified TLB: %d entries", + (regs[1] >> 16) & 0xfff); + print_AMD_l2_assoc((regs[1] >> 28) & 0xf); + } + printf("L2 unified cache: %d kbytes", regs[2] >> 16); printf(", %d bytes/line", regs[2] & 0xff); printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); - print_AMD_assoc((regs[2] >> 12) & 0x0f); + print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#3 (text+ko) ==== @@ -16,10 +16,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -41,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.113 2004/02/21 21:10:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.114 2004/04/05 21:25:51 imp Exp $"); /* * Memory special file ==== //depot/projects/netperf_socket/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -11,10 +11,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.107 2004/04/03 05:33:10 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.108 2004/04/05 23:55:13 imp Exp $ */ #include "opt_ddb.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404070345.i373jHS9063708>