Date: Fri, 14 Jul 2006 21:58:33 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 101602 for review Message-ID: <200607142158.k6ELwX6K051094@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101602 Change 101602 by peter@peter_daintree on 2006/07/14 21:57:56 IFC @101601 Untested Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/bike_sched/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/bike_sched/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/bike_sched/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/bike_sched/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/arm/at91/std.at91#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/KB920X#3 integrate .. //depot/projects/bike_sched/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/bike_sched/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/bike_sched/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/bike_sched/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/bike_sched/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/bike_sched/sys/conf/NOTES#3 integrate .. //depot/projects/bike_sched/sys/conf/files#4 integrate .. //depot/projects/bike_sched/sys/conf/files.arm#3 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/bike_sched/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/bike_sched/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/bike_sched/sys/ddb/db_command.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_output.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_output.h#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_ps.c#3 integrate .. //depot/projects/bike_sched/sys/ddb/db_thread.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/ddb.h#2 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/bike_sched/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/bike_sched/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/bike_sched/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/bike_sched/sys/dev/isp/isp.c#3 integrate .. //depot/projects/bike_sched/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/bike_sched/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/bike_sched/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/bike_sched/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/bike_sched/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/bike_sched/sys/dev/pci/pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/random/probe.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/bike_sched/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/bike_sched/sys/doc/Doxyfile#2 delete .. //depot/projects/bike_sched/sys/doc/Makefile#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/Makefile#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/README#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/bike_sched/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/bike_sched/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/geom/geom.h#3 integrate .. //depot/projects/bike_sched/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/bike_sched/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/bike_sched/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/bike_sched/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/bike_sched/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/bike_sched/sys/i386/conf/PAE#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/bike_sched/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/md_var.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/bike_sched/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/bike_sched/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/isa/isahint.c#2 integrate .. //depot/projects/bike_sched/sys/kern/bus_if.m#2 integrate .. //depot/projects/bike_sched/sys/kern/init_sysent.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_acl.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_environment.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_intr.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_linker.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_lock.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_prot.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_thr.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/bike_sched/sys/kern/subr_bus.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_hints.c#2 integrate .. //depot/projects/bike_sched/sys/kern/subr_prf.c#2 integrate .. //depot/projects/bike_sched/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/bike_sched/sys/kern/sys_generic.c#2 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.c#4 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.master#5 integrate .. //depot/projects/bike_sched/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/bike_sched/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/bike_sched/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/bike_sched/sys/net/if.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_bridge.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_clone.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_clone.h#2 integrate .. //depot/projects/bike_sched/sys/net/if_disc.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_enc.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_faith.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_gif.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_gre.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_loop.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_ppp.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_stf.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_vlan.c#3 integrate .. //depot/projects/bike_sched/sys/net/rtsock.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/bike_sched/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/bike_sched/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/bike_sched/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/bike_sched/sys/posix4/ksched.c#4 integrate .. //depot/projects/bike_sched/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/bike_sched/sys/posix4/posix4.h#2 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/bike_sched/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/bike_sched/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/bike_sched/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/bike_sched/sys/sys/bus.h#2 integrate .. //depot/projects/bike_sched/sys/sys/protosw.h#3 integrate .. //depot/projects/bike_sched/sys/sys/sockio.h#3 integrate .. //depot/projects/bike_sched/sys/sys/syscall.h#4 integrate .. //depot/projects/bike_sched/sys/sys/syscall.mk#4 integrate .. //depot/projects/bike_sched/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/bike_sched/sys/sys/sysproto.h#4 integrate .. //depot/projects/bike_sched/sys/sys/systm.h#2 integrate .. //depot/projects/bike_sched/sys/sys/thr.h#2 integrate .. //depot/projects/bike_sched/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_meter.c#3 integrate Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/bike_sched/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $"); #include "opt_cpu.h" @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003<b2>" - "\004<b3>" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006<b5>" "\007<b6>" ==== //depot/projects/bike_sched/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -338,16 +338,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/bike_sched/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.564 2006/07/05 07:04:31 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.565 2006/07/06 06:17:08 alc Exp $"); /* * Manages physical address maps. @@ -3050,14 +3050,12 @@ pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); - if (pte != NULL && (*pte & PG_A) != 0) { + if ((*pte & PG_A) != 0) { atomic_clear_long(pte, PG_A); pmap_invalidate_page(pmap, pv->pv_va); rtval++; - if (rtval > 4) { - PMAP_UNLOCK(pmap); - break; - } + if (rtval > 4) + pvn = NULL; } PMAP_UNLOCK(pmap); } while ((pv = pvn) != NULL && pv != pvf); ==== //depot/projects/bike_sched/sys/amd64/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/amd64/conf/GENERIC,v 1.463 2006/07/05 02:32:55 davidxu Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $ cpu HAMMER ident GENERIC @@ -251,6 +251,7 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! ==== //depot/projects/bike_sched/sys/amd64/include/specialreg.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.33 2006/05/01 22:07:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -109,16 +109,18 @@ #define CPUID_SS 0x08000000 #define CPUID_HTT 0x10000000 #define CPUID_TM 0x20000000 -#define CPUID_B30 0x40000000 +#define CPUID_IA64 0x40000000 #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 +#define CPUID2_VMX 0x00000020 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 #define CPUID2_CNTXID 0x00000400 #define CPUID2_CX16 0x00002000 +#define CPUID2_XTPR 0x00004000 /* * Important bits in the AMD extended cpuid flags @@ -135,6 +137,8 @@ #define AMDID2_LAHF 0x00000001 #define AMDID2_CMP 0x00000002 +#define AMDID2_SVM 0x00000004 +#define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 /* @@ -188,6 +192,7 @@ #define MSR_THERM_CONTROL 0x19a #define MSR_THERM_INTERRUPT 0x19b #define MSR_THERM_STATUS 0x19c +#define MSR_IA32_MISC_ENABLE 0x1a0 #define MSR_DEBUGCTLMSR 0x1d9 #define MSR_LASTBRANCHFROMIP 0x1db #define MSR_LASTBRANCHTOIP 0x1dc @@ -356,7 +361,7 @@ #define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ -/* X86-64 MSR's */ +/* AMD64 MSR's */ #define MSR_EFER 0xc0000080 /* extended features */ #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */ #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */ ==== //depot/projects/bike_sched/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.16 2006/06/27 18:32:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/bike_sched/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.16 2006/06/27 18:32:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.16 2006/06/27 18:32:16 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.18 2006/07/11 20:55:22 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp */ #include <bsm/audit_kevents.h> @@ -74,7 +74,7 @@ { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ { SYF_MPSAFE | AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { SYF_MPSAFE | AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ @@ -109,7 +109,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ @@ -161,7 +161,7 @@ { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ @@ -240,7 +240,7 @@ { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ ==== //depot/projects/bike_sched/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.14 2006/06/27 18:28:49 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -113,7 +113,7 @@ 51 AUE_ACCT MNOPROTO { int acct(char *path); } 52 AUE_UMOUNT MSTD { int linux_umount(char *path, l_int flags); } 53 AUE_NULL UNIMPL lock -54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL MSTD { int linux_ioctl(l_uint fd, l_uint cmd, \ uintptr_t arg); } 55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ uintptr_t arg); } @@ -169,7 +169,7 @@ 87 AUE_SWAPON MNOPROTO { int swapon(char *name); } 88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ +89 AUE_O_GETDENTS MSTD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } @@ -246,7 +246,7 @@ 140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_O_GETDENTS MSTD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 142 AUE_SELECT MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ @@ -381,7 +381,7 @@ l_size_t len, u_char *vec); } 219 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ +220 AUE_O_GETDENTS MSTD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } 221 AUE_FCNTL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \ uintptr_t arg); } ==== //depot/projects/bike_sched/sys/arm/arm/db_trace.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.12 2005/09/10 03:01:24 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.13 2006/07/12 21:22:42 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,15 +93,13 @@ db_expr_t value; db_expr_t offset; boolean_t kernel_only = TRUE; - int scp_offset, quit; + int scp_offset; frame = (u_int32_t *)addr; lastframe = NULL; scp_offset = -(get_pc_str_offset() >> 2); - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && frame != NULL && !quit) { + while (count-- && frame != NULL && !db_pager_quit) { db_addr_t scp; u_int32_t savecode; int r; ==== //depot/projects/bike_sched/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.64 2006/06/15 01:01:05 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.65 2006/07/11 11:22:06 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -199,7 +199,7 @@ static pv_entry_t pmap_get_pv_entry(void); static void pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t, - vm_prot_t, boolean_t); + vm_prot_t, boolean_t, int); static void pmap_vac_me_harder(struct vm_page *, pmap_t, vm_offset_t); static void pmap_vac_me_kpmap(struct vm_page *, pmap_t, @@ -373,7 +373,7 @@ * L2 allocation. */ #define pmap_alloc_l2_dtable() \ - (void*)uma_zalloc(l2table_zone, M_NOWAIT) + (void*)uma_zalloc(l2table_zone, M_NOWAIT|M_USE_RESERVE) #define pmap_free_l2_dtable(l2) \ uma_zfree(l2table_zone, l2) @@ -952,7 +952,7 @@ again_ptep: PMAP_UNLOCK(pm); vm_page_unlock_queues(); - ptep = (void*)uma_zalloc(l2zone, M_NOWAIT); + ptep = (void*)uma_zalloc(l2zone, M_NOWAIT|M_USE_RESERVE); vm_page_lock_queues(); PMAP_LOCK(pm); if (l2b->l2b_kva != 0) { @@ -3306,7 +3306,7 @@ vm_page_lock_queues(); PMAP_LOCK(pmap); - pmap_enter_locked(pmap, va, m, prot, wired); + pmap_enter_locked(pmap, va, m, prot, wired, M_WAITOK); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -3316,7 +3316,7 @@ */ static void pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) + boolean_t wired, int flags) { struct l2_bucket *l2b = NULL; struct vm_page *opg; @@ -3347,10 +3347,22 @@ l2b = pmap_get_l2_bucket(pmap, va); if (l2b == NULL) l2b = pmap_grow_l2_bucket(pmap, va); - } else + } else { +do_l2b_alloc: l2b = pmap_alloc_l2_bucket(pmap, va); - KASSERT(l2b != NULL, - ("pmap_enter: failed to allocate l2 bucket")); + if (l2b == NULL) { + if (flags & M_WAITOK) { + PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); + VM_WAIT; + vm_page_lock_queues(); + PMAP_LOCK(pmap); + goto do_l2b_alloc; + } + return; + } + } + ptep = &l2b->l2b_kva[l2pte_index(va)]; opte = *ptep; @@ -3557,7 +3569,7 @@ PMAP_LOCK(pmap); while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { pmap_enter_locked(pmap, start + ptoa(diff), m, prot & - (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); + (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT); m = TAILQ_NEXT(m, listq); } PMAP_UNLOCK(pmap); @@ -3578,7 +3590,7 @@ PMAP_LOCK(pmap); pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), - FALSE); + FALSE, M_NOWAIT); PMAP_UNLOCK(pmap); } ==== //depot/projects/bike_sched/sys/arm/at91/at91_rtc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.1 2006/03/24 07:35:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.2 2006/07/14 21:37:19 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -223,9 +223,14 @@ static int at91_rtc_settime(device_t dev, struct timespec *ts) { - // XXX UGLY XXX - printf("SET TIME\n"); - return (EINVAL); + struct at91_rtc_softc *sc; + struct clocktime ct; + + sc = device_get_softc(dev); + clock_ts_to_ct(ts, &ct); + WR4(sc, RTC_TIMR, RTC_TIMR_MK(ct.hour, ct.min, ct.sec)); + WR4(sc, RTC_CALR, RTC_CALR_MK(ct.year, ct.mon, ct.day, ct.dow)); + return (0); } static device_method_t at91_rtc_methods[] = { ==== //depot/projects/bike_sched/sys/arm/at91/at91_spi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.2 2006/07/14 21:35:59 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,10 @@ #include <machine/bus.h> #include <arm/at91/at91_spireg.h> -#include <arm/at91/at91_spiio.h> +#include <arm/at91/at91_pdcreg.h> + +#include <dev/spibus/spi.h> +#include "spibus_if.h" struct at91_spi_softc { @@ -48,13 +51,8 @@ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ - int flags; -#define XFER_PENDING 1 /* true when transfer taking place */ -#define OPENED 2 /* Device opened */ -#define RXRDY 4 -#define TXCOMP 8 -#define TXRDY 0x10 - struct cdev *cdev; + bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ + bus_dmamap_t map[4]; /* Maps for the transaction */ }; static inline uint32_t @@ -77,7 +75,6 @@ #define AT91_SPI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_SPI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_SPI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -#define CDEV2SOFTC(dev) ((dev)->si_drv1) static devclass_t at91_spi_devclass; @@ -86,25 +83,11 @@ static int at91_spi_probe(device_t dev); static int at91_spi_attach(device_t dev); static int at91_spi_detach(device_t dev); -static void at91_spi_intr(void *); /* helper routines */ static int at91_spi_activate(device_t dev); static void at91_spi_deactivate(device_t dev); -/* cdev routines */ -static d_open_t at91_spi_open; -static d_close_t at91_spi_close; -static d_ioctl_t at91_spi_ioctl; - -static struct cdevsw at91_spi_cdevsw = -{ - .d_version = D_VERSION, - .d_open = at91_spi_open, - .d_close = at91_spi_close, - .d_ioctl = at91_spi_ioctl -}; - static int at91_spi_probe(device_t dev) { @@ -116,7 +99,7 @@ at91_spi_attach(device_t dev) { struct at91_spi_softc *sc = device_get_softc(dev); - int err; + int err, i; sc->dev = dev; err = at91_spi_activate(dev); @@ -126,31 +109,45 @@ AT91_SPI_LOCK_INIT(sc); /* - * Activate the interrupt + * Allocate DMA tags and maps */ - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_spi_intr, sc, &sc->intrhand); - if (err) { - AT91_SPI_LOCK_DESTROY(sc); + err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, 2058, 1, 2048, BUS_DMA_ALLOCNOW, + NULL, NULL, &sc->dmatag); + if (err != 0) goto out; + for (i = 0; i < 4; i++) { + err = bus_dmamap_create(sc->dmatag, 0, &sc->map[i]); + if (err != 0) + goto out; } - sc->cdev = make_dev(&at91_spi_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "spi%d", device_get_unit(dev)); - if (sc->cdev == NULL) { - err = ENOMEM; - goto out; - } - sc->cdev->si_drv1 = sc; -#if 0 - /* init */ - sc->cwgr = SPI_CWGR_CKDIV(1) | - SPI_CWGR_CHDIV(SPI_CWGR_DIV(SPI_DEF_CLK)) | - SPI_CWGR_CLDIV(SPI_CWGR_DIV(SPI_DEF_CLK)); + // reset the SPI WR4(sc, SPI_CR, SPI_CR_SWRST); - WR4(sc, SPI_CR, SPI_CR_MSEN | SPI_CR_SVDIS); - WR4(sc, SPI_CWGR, sc->cwgr); -#endif + + WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | + (0xE << 16)); + + WR4(sc, SPI_CSR0, SPI_CSR_CPOL | (4 << 16) | (2 << 8)); + WR4(sc, SPI_CR, SPI_CR_SPIEN); + + WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); + WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS); + WR4(sc, PDC_RNPR, 0); + WR4(sc, PDC_RNCR, 0); + WR4(sc, PDC_TNPR, 0); + WR4(sc, PDC_TNCR, 0); + WR4(sc, PDC_RPR, 0); + WR4(sc, PDC_RCR, 0); + WR4(sc, PDC_TPR, 0); + WR4(sc, PDC_TCR, 0); + WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + RD4(sc, SPI_RDR); + RD4(sc, SPI_SR); + + device_add_child(dev, "spibus", -1); + bus_generic_attach(dev); out:; if (err) at91_spi_deactivate(dev); @@ -208,229 +205,70 @@ } static void -at91_spi_intr(void *xsc) +at91_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { - struct at91_spi_softc *sc = xsc; -#if 0 - uint32_t status; - - /* Reading the status also clears the interrupt */ - status = RD4(sc, SPI_SR); - if (status == 0) + if (error != 0) return; - AT91_SPI_LOCK(sc); - if (status & SPI_SR_RXRDY) - sc->flags |= RXRDY; - if (status & SPI_SR_TXCOMP) - sc->flags |= TXCOMP; - if (status & SPI_SR_TXRDY) - sc->flags |= TXRDY; - AT91_SPI_UNLOCK(sc); -#endif - wakeup(sc); - return; -} - -static int -at91_spi_open(struct cdev *dev, int oflags, int devtype, struct thread *td) -{ - struct at91_spi_softc *sc; - - sc = CDEV2SOFTC(dev); - AT91_SPI_LOCK(sc); - if (!(sc->flags & OPENED)) { - sc->flags |= OPENED; -#if 0 - WR4(sc, SPI_IER, SPI_SR_TXCOMP | SPI_SR_RXRDY | SPI_SR_TXRDY | - SPI_SR_OVRE | SPI_SR_UNRE | SPI_SR_NACK); -#endif - } - AT91_SPI_UNLOCK(sc); - return (0); + *(bus_addr_t *)arg = segs[0].ds_addr; } static int -at91_spi_close(struct cdev *dev, int fflag, int devtype, struct thread *td) +at91_spi_transfer(device_t dev, device_t child, struct spi_command *cmd) { struct at91_spi_softc *sc; + int i; + bus_addr_t addr; - sc = CDEV2SOFTC(dev); - AT91_SPI_LOCK(sc); - sc->flags &= ~OPENED; -#if 0 - WR4(sc, SPI_IDR, SPI_SR_TXCOMP | SPI_SR_RXRDY | SPI_SR_TXRDY | - SPI_SR_OVRE | SPI_SR_UNRE | SPI_SR_NACK); -#endif - AT91_SPI_UNLOCK(sc); - return (0); -} >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607142158.k6ELwX6K051094>