PERFORCE change 124898 for review
Jesper Brix Rosenkilde
jbr at FreeBSD.org
Wed Aug 8 06:21:21 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=124898
Change 124898 by jbr at jbr_bob on 2007/08/08 13:20:20
sync with current
Affected files ...
.. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/at91/ohci_atmelarm.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/CRB#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/include/pte.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/i80321var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/files.crb#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/files.i81342#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/i81342.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/i81342var.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/obio.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/obio_space.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/obiovar.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/std.crb#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/std.i81342#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit_internal.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/files#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/options#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/conf/options.ia64#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/contrib/pf/net/if_pfsync.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/acpica/acpi_timer.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ce/if_ce.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cp/if_cp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/firewire/firewire.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ipmi/ipmi_isa.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/isc_cam.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/isc_sm.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/isc_soc.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/isc_subr.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/iscsi.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/iscsi.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/iscsi/initiator/iscsivar.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/eth_z8e.dat.gz.uu#3 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/eth_z8e.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/ethp_z8e.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mxge_eth_z8e.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/mxge/mxge_ethp_z8e.c#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/nfe/if_nfevar.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/nmdm/nmdm.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/ufoma.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/umodem.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vfsops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/coda/coda_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/swtch.s#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/sapic.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/include/ia64_cpu.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/include/intr.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/ia64/include/sapicvar.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/tty.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/uipc_domain.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/Makefile#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/iscsi/Makefile#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/iscsi/initiator/Makefile#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/bpf.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/bridgestp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/bridgestp.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/if.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/if_bridge.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/if_lagg.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/if_lagg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net/netisr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/ng_bpf.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netgraph/ng_ppp.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/icmp_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/in_mcast.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/in_pcb.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_asconf.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_cc_functions.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_peeloff.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_uio.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_syncache.h#1 branch
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/in6.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_output.c#3 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netinet6/udp6_var.h#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipx/spx_debug.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/netipx/spx_debug.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/pci/viapm.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/include/interruptvar.h#2 delete
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/include/intr_machdep.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/include/trap.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/powerpc/interrupt.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/include/iommureg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/sbus/sbusreg.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/sparc64/eeprom.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/sparc64/iommu.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sparc64/sparc64/rtc.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/kernel.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/mutex.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/proc.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/rwlock.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/device_pager.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/phys_pager.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_page.c#3 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vm_pager.c#2 integrate
.. //depot/projects/soc2007/jbr-syscall/src/sys/vm/vnode_pager.c#2 integrate
Differences ...
==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/cpu_switch.S#2 (text+ko) ====
@@ -30,13 +30,14 @@
* 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.158 2007/06/06 07:35:07 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $
*/
#include <machine/asmacros.h>
#include <machine/specialreg.h>
#include "assym.s"
+#include "opt_sched.h"
/*****************************************************************************/
/* Scheduling */
@@ -50,6 +51,12 @@
#define LK
#endif
+#if defined(SCHED_ULE) && defined(SMP)
+#define SETLK xchgq
+#else
+#define SETLK movq
+#endif
+
/*
* cpu_throw()
*
@@ -148,13 +155,7 @@
movq %cr3,%rax
cmpq %rcx,%rax /* Same address space? */
jne swinact
- movq %rdx, TD_LOCK(%rdi) /* Release the old thread */
- /* Wait for the new thread to become unblocked */
- movq $blocked_lock, %rdx
-1:
- movq TD_LOCK(%rsi),%rcx
- cmpq %rcx, %rdx
- je 1b
+ SETLK %rdx, TD_LOCK(%rdi) /* Release the old thread */
jmp sw1
swinact:
movq %rcx,%cr3 /* new address space */
@@ -163,21 +164,24 @@
movq TD_PROC(%rdi), %rcx /* oldproc */
movq P_VMSPACE(%rcx), %rcx
LK btrl %eax, VM_PMAP+PM_ACTIVE(%rcx) /* clear old */
- movq %rdx, TD_LOCK(%rdi) /* Release the old thread */
+ SETLK %rdx, TD_LOCK(%rdi) /* Release the old thread */
swact:
+ /* Set bit in new pmap->pm_active */
+ movq TD_PROC(%rsi),%rdx /* newproc */
+ movq P_VMSPACE(%rdx), %rdx
+ LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */
+
+sw1:
+#if defined(SCHED_ULE) && defined(SMP)
/* Wait for the new thread to become unblocked */
movq $blocked_lock, %rdx
1:
movq TD_LOCK(%rsi),%rcx
cmpq %rcx, %rdx
+ pause
je 1b
-
- /* Set bit in new pmap->pm_active */
- movq TD_PROC(%rsi),%rdx /* newproc */
- movq P_VMSPACE(%rdx), %rdx
- LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */
-
-sw1:
+ lfence
+#endif
/*
* At this point, we've switched address spaces and are ready
* to load up the rest of the next context.
==== //depot/projects/soc2007/jbr-syscall/src/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.40 2007/05/08 22:01:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $");
#include "opt_hwpmc_hooks.h"
@@ -1060,10 +1060,6 @@
if (retval != 0)
printf("%s: Failed to setup the local APIC: returned %d\n",
best_enum->apic_name, retval);
-#ifdef SMP
- /* Last, setup the cpu topology now that we have probed CPUs */
- mp_topology();
-#endif
}
SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287 2007/08/02 21:17:58 peter Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -186,26 +186,14 @@
mp_topology(void)
{
struct cpu_group *group;
- u_int regs[4];
- int logical_cpus;
int apic_id;
int groups;
int cpu;
/* Build the smp_topology map. */
/* Nothing to do if there is no HTT support. */
- if ((cpu_feature & CPUID_HTT) == 0)
+ if (hyperthreading_cpus <= 1)
return;
- logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
- if (logical_cpus <= 1)
- return;
- /* Nothing to do if reported cores are physical cores. */
- if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) {
- cpuid_count(4, 0, regs);
- if ((regs[0] & 0x1f) != 0 &&
- logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1)
- return;
- }
group = &mp_groups[0];
groups = 1;
for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) {
@@ -215,7 +203,8 @@
* If the current group has members and we're not a logical
* cpu, create a new group.
*/
- if (group->cg_count != 0 && (apic_id % logical_cpus) == 0) {
+ if (group->cg_count != 0 &&
+ (apic_id % hyperthreading_cpus) == 0) {
group++;
groups++;
}
@@ -420,6 +409,9 @@
}
set_interrupt_apic_ids();
+
+ /* Last, setup the cpu topology now that we have probed CPUs */
+ mp_topology();
}
==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/trap.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.318 2007/06/10 21:59:12 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319 2007/07/26 15:32:54 jhb Exp $");
/*
* AMD64 Trap and System call handling
@@ -159,7 +159,8 @@
{
struct thread *td = curthread;
struct proc *p = td->td_proc;
- int i = 0, ucode = 0, type, code;
+ int i = 0, ucode = 0, code;
+ u_int type;
register_t addr = 0;
ksiginfo_t ksi;
@@ -622,7 +623,8 @@
struct trapframe *frame;
vm_offset_t eva;
{
- int code, type, ss;
+ int code, ss;
+ u_int type;
long esp;
struct soft_segment_descriptor softseg;
char *msg;
==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/isa/clock.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.232 2007/06/15 22:58:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.233 2007/07/23 09:42:30 dwmalone Exp $");
/*
* Routines to handle clock hardware.
@@ -686,8 +686,7 @@
return;
wrong_time:
- printf("Invalid time in real time clock.\n");
- printf("Check and reset the date immediately!\n");
+ printf("Invalid time in clock: check and reset the date!\n");
}
/*
==== //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.33 2007/06/10 12:33:01 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.34 2007/07/27 14:46:43 cognet Exp $");
/*
* ARM bus dma support routines
@@ -763,8 +763,12 @@
if (__predict_true(pmap == pmap_kernel())) {
(void) pmap_get_pde_pte(pmap, vaddr, &pde, &ptep);
if (__predict_false(pmap_pde_section(pde))) {
- curaddr = (*pde & L1_S_FRAME) |
- (vaddr & L1_S_OFFSET);
+ if (*pde & L1_S_SUPERSEC)
+ curaddr = (*pde & L1_SUP_FRAME) |
+ (vaddr & L1_SUP_OFFSET);
+ else
+ curaddr = (*pde & L1_S_FRAME) |
+ (vaddr & L1_S_OFFSET);
if (*pde & L1_S_CACHE_MASK) {
map->flags &=
~DMAMAP_COHERENT;
@@ -1087,36 +1091,36 @@
{
char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
- if (op & BUS_DMASYNC_PREWRITE)
+ if (op & BUS_DMASYNC_PREWRITE) {
cpu_dcache_wb_range((vm_offset_t)buf, len);
+ cpu_l2cache_wb_range((vm_offset_t)buf, len);
+ }
+ if (op & BUS_DMASYNC_PREREAD) {
+ cpu_idcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_l2cache_wbinv_range((vm_offset_t)buf, len);
+ }
if (op & BUS_DMASYNC_POSTREAD) {
- if ((vm_offset_t)buf & arm_dcache_align_mask)
+ if ((vm_offset_t)buf & arm_dcache_align_mask) {
memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
arm_dcache_align_mask),
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
- if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
- arm_dcache_align_mask),
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
- if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy(_tmp_clend, (void *)(((vm_offset_t)buf + len) & ~
- arm_dcache_align_mask),
- (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
- arm_dcache_align_mask));
+ (vm_offset_t)buf & arm_dcache_align_mask);
+ }
+ if (((vm_offset_t)buf + len) & arm_dcache_align_mask) {
+ memcpy(_tmp_clend, (void *)((vm_offset_t)buf + len),
+ arm_dcache_align - (((vm_offset_t)(buf) + len) &
+ arm_dcache_align_mask));
+ }
cpu_dcache_inv_range((vm_offset_t)buf, len);
+ cpu_l2cache_inv_range((vm_offset_t)buf, len);
+
if ((vm_offset_t)buf & arm_dcache_align_mask)
memcpy((void *)((vm_offset_t)buf &
- ~arm_dcache_align_mask),
- _tmp_cl,
- (vm_offset_t)buf - ((vm_offset_t)buf &~
- arm_dcache_align_mask));
+ ~arm_dcache_align_mask), _tmp_cl,
+ (vm_offset_t)buf & arm_dcache_align_mask);
if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
- memcpy((void *)(((vm_offset_t)buf + len) & ~
- arm_dcache_align_mask), _tmp_clend,
- (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
- arm_dcache_align_mask));
+ memcpy((void *)((vm_offset_t)buf + len), _tmp_clend,
+ arm_dcache_align - (((vm_offset_t)(buf) + len) &
+ arm_dcache_align_mask));
}
}
@@ -1131,14 +1135,20 @@
(void *)(bpage->vaddr_nocache != 0 ?
bpage->vaddr_nocache : bpage->vaddr),
bpage->datacount);
- if (bpage->vaddr_nocache == 0)
+ if (bpage->vaddr_nocache == 0) {
cpu_dcache_wb_range(bpage->vaddr,
bpage->datacount);
+ cpu_l2cache_wb_range(bpage->vaddr,
+ bpage->datacount);
+ }
}
if (op & BUS_DMASYNC_POSTREAD) {
- if (bpage->vaddr_nocache == 0)
+ if (bpage->vaddr_nocache == 0) {
cpu_dcache_inv_range(bpage->vaddr,
bpage->datacount);
+ cpu_l2cache_inv_range(bpage->vaddr,
+ bpage->datacount);
+ }
bcopy((void *)(bpage->vaddr_nocache != 0 ?
bpage->vaddr_nocache : bpage->vaddr),
(void *)bpage->datavaddr, bpage->datacount);
@@ -1175,10 +1185,6 @@
_bus_dmamap_sync_bp(dmat, map, op);
if (map->flags & DMAMAP_COHERENT)
return;
- if ((op && BUS_DMASYNC_POSTREAD) && (map->len >= 2 * PAGE_SIZE)) {
- cpu_dcache_wbinv_all();
- return;
- }
CTR3(KTR_BUSDMA, "%s: op %x flags %x", __func__, op, map->flags);
switch(map->flags & DMAMAP_TYPE_MASK) {
case DMAMAP_LINEAR:
==== //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/cpufunc.c#2 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,6 +147,10 @@
arm7tdmi_cache_flushID, /* idcache_wbinv_all */
(void *)arm7tdmi_cache_flushID, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -205,6 +209,10 @@
arm8_cache_purgeID, /* idcache_wbinv_all */
(void *)arm8_cache_purgeID, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -262,6 +270,10 @@
arm9_idcache_wbinv_all, /* idcache_wbinv_all */
arm9_idcache_wbinv_range, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -320,6 +332,10 @@
arm10_idcache_wbinv_all, /* idcache_wbinv_all */
arm10_idcache_wbinv_range, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -378,6 +394,10 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -435,6 +455,10 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -492,6 +516,10 @@
sa1_cache_purgeID, /* idcache_wbinv_all */
sa1_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -552,6 +580,10 @@
xscale_cache_purgeID, /* idcache_wbinv_all */
xscale_cache_purgeID_rng, /* idcache_wbinv_range */
+ cpufunc_nullop, /* l2cache_wbinv_all */
+ (void *)cpufunc_nullop, /* l2cache_wbinv_range */
+ (void *)cpufunc_nullop, /* l2cache_inv_range */
+ (void *)cpufunc_nullop, /* l2cache_wb_range */
/* Other functions */
@@ -602,15 +634,19 @@
/* Cache operations */
xscalec3_cache_syncI, /* icache_sync_all */
- xscale_cache_syncI_rng, /* icache_sync_range */
+ xscalec3_cache_syncI_rng, /* icache_sync_range */
xscalec3_cache_purgeD, /* dcache_wbinv_all */
xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */
xscale_cache_flushD_rng, /* dcache_inv_range */
xscalec3_cache_cleanD_rng, /* dcache_wb_range */
- xscalec3_cache_purgeID, /* idcache_wbinv_all */
+ xscalec3_cache_purgeID, /* idcache_wbinv_all */
xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */
+ xscalec3_l2cache_purge, /* l2cache_wbinv_all */
+ xscalec3_l2cache_purge_rng, /* l2cache_wbinv_range */
+ xscalec3_l2cache_flush_rng, /* l2cache_inv_range */
+ xscalec3_l2cache_clean_rng, /* l2cache_wb_range */
/* Other functions */
@@ -1889,9 +1925,7 @@
xscale_setup(args)
char *args;
{
-#ifndef CPU_XSCALE_CORE3
uint32_t auxctl;
-#endif
int cpuctrl, cpuctrlmask;
/*
@@ -1911,7 +1945,8 @@
| CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE
- | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC;
+ | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC | \
+ CPU_CONTROL_L2_ENABLE;
#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -1925,6 +1960,9 @@
if (vector_page == ARM_VECTORS_HIGH)
cpuctrl |= CPU_CONTROL_VECRELOC;
+#ifdef CPU_XSCALE_CORE3
+ cpuctrl |= CPU_CONTROL_L2_ENABLE;
+#endif
/* Clear out the cache */
cpu_idcache_wbinv_all();
@@ -1937,7 +1975,6 @@
/* cpu_control(cpuctrlmask, cpuctrl);*/
cpu_control(0xffffffff, cpuctrl);
-#ifndef CPU_XSCALE_CORE3
/* Make sure write coalescing is turned on */
__asm __volatile("mrc p15, 0, %0, c1, c0, 1"
: "=r" (auxctl));
@@ -1946,9 +1983,12 @@
#else
auxctl &= ~XSCALE_AUXCTL_K;
#endif
+#ifdef CPU_XSCALE_CORE3
+ auxctl |= XSCALE_AUXCTL_LLR;
+ auxctl |= XSCALE_AUXCTL_MD_MASK;
+#endif
__asm __volatile("mcr p15, 0, %0, c1, c0, 1"
: : "r" (auxctl));
-#endif
}
#endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425
CPU_XSCALE_80219 */
==== //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/elf_trampoline.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.17 2007/02/19 00:57:27 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.18 2007/07/27 14:42:25 cognet Exp $");
#include <machine/asm.h>
#include <sys/param.h>
#include <sys/elf32.h>
@@ -48,6 +48,7 @@
extern void *_end;
void __start(void);
+void __startC(void);
#define GZ_HEAD 0xa
@@ -66,7 +67,14 @@
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
defined(CPU_XSCALE_80219)
#define cpu_idcache_wbinv_all xscale_cache_purgeID
+#elif defined(CPU_XSCALE_81342)
+#define cpu_idcache_wbinv_all xscalec3_cache_purgeID
#endif
+#ifdef CPU_XSCALE_81342
+#define cpu_l2cache_wbinv_all xscalec3_l2cache_purge
+#else
+#define cpu_l2cache_wbinv_all()
+#endif
int arm_picache_size;
@@ -138,7 +146,7 @@
static void arm9_setup(void);
void
-_start(void)
+_startC(void)
{
int physaddr = KERNPHYSADDR;
int tmp1;
@@ -207,6 +215,7 @@
arm9_setup();
#endif
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
#endif
__start();
}
@@ -520,7 +529,7 @@
extern char func_end[];
-#define PMAP_DOMAIN_KERNEL 15 /*
+#define PMAP_DOMAIN_KERNEL 0 /*
* Just define it instead of including the
* whole VM headers set.
*/
@@ -595,10 +604,11 @@
kernel = (char *)&_end;
altdst = 4 + load_kernel((unsigned int)kernel,
(unsigned int)curaddr,
- (unsigned int)&func_end , 0);
+ (unsigned int)&func_end + 800 , 0);
if (altdst > dst)
dst = altdst;
cpu_idcache_wbinv_all();
+ cpu_l2cache_wbinv_all();
__asm __volatile("mrc p15, 0, %0, c1, c0, 0\n"
"bic %0, %0, #1\n" /* MMU_ENABLE */
"mcr p15, 0, %0, c1, c0, 0\n"
@@ -616,7 +626,7 @@
sp = sp &~3;
dst = (void *)(sp + 4);
memcpy((void *)dst, (void *)&load_kernel, (unsigned int)&func_end -
- (unsigned int)&load_kernel);
+ (unsigned int)&load_kernel + 800);
do_call(dst, kernel, dst + (unsigned int)(&func_end) -
- (unsigned int)(&load_kernel), sp);
+ (unsigned int)(&load_kernel) + 800, sp);
}
==== //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/genassym.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.9 2007/05/23 13:21:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.10 2007/08/08 09:27:52 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
@@ -92,6 +92,7 @@
ASSYM(TD_PROC, offsetof(struct thread, td_proc));
ASSYM(TD_FRAME, offsetof(struct thread, td_frame));
ASSYM(TD_MD, offsetof(struct thread, td_md));
+ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
ASSYM(MD_TP, offsetof(struct mdthread, md_tp));
ASSYM(TF_R0, offsetof(struct trapframe, tf_r0));
==== //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/identcpu.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $");
#include <sys/systm.h>
#include <sys/param.h>
#include <sys/malloc.h>
@@ -374,6 +374,12 @@
printf(" IC disabled");
else
printf(" IC enabled");
+#ifdef CPU_XSCALE_81342
+ if ((ctrl & CPU_CONTROL_L2_ENABLE) == 0)
+ printf(" L2 disabled");
+ else
+ printf(" L2 enabled");
+#endif
break;
default:
break;
==== //depot/projects/soc2007/jbr-syscall/src/sys/arm/arm/intr.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.16 2007/06/04 21:38:45 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.17 2007/07/27 14:26:42 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -57,6 +57,27 @@
void arm_handler_execute(struct trapframe *, int);
+#ifdef INTR_FILTER
+static void
+intr_disab_eoi_src(void *arg)
+{
+ uintptr_t nb;
+
+ nb = (uintptr_t)arg;
+ arm_mask_irq(nb);
+}
+
+static void
+intr_eoi_src(void *arg)
+{
+ uintptr_t nb;
+
+ nb = (uintptr_t)arg;
+ arm_unmask_irq(nb);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list