PERFORCE change 164580 for review
John Baldwin
jhb at FreeBSD.org
Wed Jun 17 14:16:35 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164580
Change 164580 by jhb at jhb_jhbbsd on 2009/06/17 14:15:45
IFC @164577
Affected files ...
.. //depot/projects/smpng/share/man/man9/lock.9#2 integrate
.. //depot/projects/smpng/share/man/man9/netisr.9#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/msi.c#11 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#95 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#80 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#8 integrate
.. //depot/projects/smpng/sys/arm/mv/common.c#5 integrate
.. //depot/projects/smpng/sys/arm/mv/discovery/db78xxx.c#4 integrate
.. //depot/projects/smpng/sys/arm/mv/discovery/discovery.c#4 integrate
.. //depot/projects/smpng/sys/arm/mv/kirkwood/db88f6xxx.c#4 integrate
.. //depot/projects/smpng/sys/arm/mv/kirkwood/kirkwood.c#4 integrate
.. //depot/projects/smpng/sys/arm/mv/mvreg.h#5 integrate
.. //depot/projects/smpng/sys/arm/mv/mvwin.h#1 branch
.. //depot/projects/smpng/sys/arm/mv/orion/db88f5xxx.c#4 integrate
.. //depot/projects/smpng/sys/arm/mv/orion/orion.c#4 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#14 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#12 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#7 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npereg.h#2 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425var.h#5 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#63 integrate
.. //depot/projects/smpng/sys/cam/cam.c#9 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#54 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#54 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#54 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#55 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#58 integrate
.. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#77 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_futex.c#13 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#59 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#100 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#13 integrate
.. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#23 integrate
.. //depot/projects/smpng/sys/conf/NOTES#172 integrate
.. //depot/projects/smpng/sys/conf/files#244 integrate
.. //depot/projects/smpng/sys/conf/options#171 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-usb.c#14 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_desc.h#2 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#16 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#78 integrate
.. //depot/projects/smpng/sys/dev/cas/if_cas.c#1 branch
.. //depot/projects/smpng/sys/dev/cas/if_casreg.h#1 branch
.. //depot/projects/smpng/sys/dev/cas/if_casvar.h#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#19 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewire.c#51 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#36 integrate
.. //depot/projects/smpng/sys/dev/mii/nsgphy.c#18 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#3 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#3 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#18 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_if.m#2 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#4 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#4 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofwvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.c#15 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirm.h#11 integrate
.. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#14 integrate
.. //depot/projects/smpng/sys/dev/sec/sec.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#34 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#28 integrate
.. //depot/projects/smpng/sys/dev/sound/version.h#3 integrate
.. //depot/projects/smpng/sys/dev/syscons/daemon/daemon_saver.c#8 integrate
.. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#6 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#7 integrate
.. //depot/projects/smpng/sys/dev/tsec/if_tsec.c#5 integrate
.. //depot/projects/smpng/sys/dev/tsec/if_tsec.h#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_mv.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_mbus.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci_atmelarm.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/input/uhid.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ums.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_auereg.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_axereg.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_ruereg.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_udavreg.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uark.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umct.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/umass.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/urio.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.h#20 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_bus.h#8 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_busdma.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_controller.h#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_core.h#12 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_debug.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_debug.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_defs.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dev.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dev.h#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.h#12 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_endian.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_error.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_error.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_generic.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_generic.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_handle_request.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hid.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hid.h#8 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hub.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hub.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_if.m#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_ioctl.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_lookup.h#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_mbuf.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_mfunc.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_msctest.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_parse.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_parse.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_pci.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_process.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_process.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_request.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_request.h#8 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_revision.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_util.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_util.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#139 integrate
.. //depot/projects/smpng/sys/dev/usb/usbhid.h#8 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#8 integrate
.. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#6 integrate
.. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#11 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_lookup.c#4 integrate
.. //depot/projects/smpng/sys/fs/nfs/nfsport.h#6 integrate
.. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#5 integrate
.. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate
.. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.c#16 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.h#9 integrate
.. //depot/projects/smpng/sys/geom/label/g_label_gpt.c#1 branch
.. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_lookup.c#7 integrate
.. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#15 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#111 integrate
.. //depot/projects/smpng/sys/i386/i386/msi.c#11 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#135 integrate
.. //depot/projects/smpng/sys/i386/include/cpufunc.h#40 integrate
.. //depot/projects/smpng/sys/i386/include/in_cksum.h#10 integrate
.. //depot/projects/smpng/sys/i386/include/pmap.h#43 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#26 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#91 integrate
.. //depot/projects/smpng/sys/kern/kern_acct.c#57 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#127 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#141 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#72 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#77 integrate
.. //depot/projects/smpng/sys/kern/kern_lockf.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_mib.c#45 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#78 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#65 integrate
.. //depot/projects/smpng/sys/kern/kern_vimage.c#8 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#90 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#96 integrate
.. //depot/projects/smpng/sys/kern/systrace_args.c#17 integrate
.. //depot/projects/smpng/sys/kern/tty.c#94 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#126 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#149 integrate
.. //depot/projects/smpng/sys/kgssapi/krb5/krb5_mech.c#2 integrate
.. //depot/projects/smpng/sys/mips/adm5120/if_admsw.c#4 integrate
.. //depot/projects/smpng/sys/mips/conf/.cvsignore#1 branch
.. //depot/projects/smpng/sys/mips/conf/ADM5120#5 integrate
.. //depot/projects/smpng/sys/mips/idt/files.idt#2 integrate
.. //depot/projects/smpng/sys/mips/idt/idtpci.c#4 integrate
.. //depot/projects/smpng/sys/mips/idt/if_kr.c#4 integrate
.. //depot/projects/smpng/sys/mips/malta/gt_pci.c#5 integrate
.. //depot/projects/smpng/sys/mips/mips/mainbus.c#2 integrate
.. //depot/projects/smpng/sys/modules/Makefile#164 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#18 integrate
.. //depot/projects/smpng/sys/modules/cas/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/if_ppp/Makefile#11 delete
.. //depot/projects/smpng/sys/modules/if_sl/Makefile#4 delete
.. //depot/projects/smpng/sys/modules/wlan/Makefile#13 integrate
.. //depot/projects/smpng/sys/net/flowtable.h#4 integrate
.. //depot/projects/smpng/sys/net/if.c#122 integrate
.. //depot/projects/smpng/sys/net/if.h#42 integrate
.. //depot/projects/smpng/sys/net/if_enc.c#12 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#40 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#62 integrate
.. //depot/projects/smpng/sys/net/if_var.h#66 integrate
.. //depot/projects/smpng/sys/net/netisr.c#18 integrate
.. //depot/projects/smpng/sys/net/netisr.h#15 integrate
.. //depot/projects/smpng/sys/net/pfkeyv2.h#10 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#23 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#26 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#13 integrate
.. //depot/projects/smpng/sys/netinet/in_proto.c#34 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#102 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#110 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#42 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#3 integrate
.. //depot/projects/smpng/sys/netinet/sctp.h#12 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#25 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#26 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#30 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#128 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#62 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#115 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#47 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#79 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#70 integrate
.. //depot/projects/smpng/sys/netinet/udp.h#5 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#94 integrate
.. //depot/projects/smpng/sys/netinet/udp_var.h#15 integrate
.. //depot/projects/smpng/sys/netinet6/icmp6.c#56 integrate
.. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#36 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_input.c#21 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_output.c#19 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#37 integrate
.. //depot/projects/smpng/sys/netipsec/key.h#7 integrate
.. //depot/projects/smpng/sys/netipsec/keydb.h#7 integrate
.. //depot/projects/smpng/sys/netipsec/xform_tcp.c#7 integrate
.. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#43 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#73 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#89 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#8 integrate
.. //depot/projects/smpng/sys/nlm/nlm_advlock.c#7 integrate
.. //depot/projects/smpng/sys/powerpc/booke/pmap.c#12 integrate
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#95 integrate
.. //depot/projects/smpng/sys/sys/jail.h#28 integrate
.. //depot/projects/smpng/sys/sys/lockmgr.h#28 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#83 integrate
.. //depot/projects/smpng/sys/sys/param.h#148 integrate
.. //depot/projects/smpng/sys/sys/priv.h#20 integrate
.. //depot/projects/smpng/sys/sys/sockio.h#15 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#89 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#89 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#59 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#93 integrate
.. //depot/projects/smpng/sys/sys/vimage.h#15 integrate
.. //depot/projects/smpng/sys/tools/sound/feeder_rate_mkfilter.awk#2 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#36 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#77 integrate
.. //depot/projects/smpng/sys/vm/phys_pager.c#18 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#108 integrate
.. //depot/projects/smpng/sys/vm/vm_object.h#37 integrate
Differences ...
==== //depot/projects/smpng/share/man/man9/lock.9#2 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.34 2009/02/05 15:09:04 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.35 2009/06/17 01:55:42 attilio Exp $
.\"
-.Dd February 05, 2009
+.Dd June 16, 2009
.Dt LOCK 9
.Os
.Sh NAME
@@ -96,6 +96,9 @@
.It Fa flags
The flags the lock is to be initialized with:
.Bl -tag -width ".Dv LK_CANRECURSE"
+.It Dv LK_ADAPTIVE
+Enable adaptive spinning for this lock if the kernel is compiled with the
+ADAPTIVE_LOCKMGRS option.
.It Dv LK_CANRECURSE
Allow recursive exclusive locks.
.It Dv LK_NOPROFILE
==== //depot/projects/smpng/share/man/man9/netisr.9#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.1 2009/06/07 21:32:01 rwatson Exp $
+.\" $FreeBSD: src/share/man/man9/netisr.9,v 1.3 2009/06/14 17:15:18 bz Exp $
.\"
-.Dd June 7, 2009
+.Dd June 14, 2009
.Dt NETISR 9
.Os
.Sh NAME
@@ -51,8 +51,7 @@
.Fn netisr_clearqdrops "const struct netisr_handler *nhp"
.Ft void
.Fn netisr_getqdrops "const struct netisr_handler *nhp" "u_int64_t *qdropsp"
-.Ft
-void
+.Ft void
.Fn netisr_getqlimit "const struct netisr_handler *nhp" "u_int *qlimitp"
.Ft int
.Fn netisr_setqlimit "const struct netisr_handler *nhp" "u_int qlimit"
@@ -138,6 +137,13 @@
Protocol function to determine what CPU a packet should be processed on.
Will be used only with
.Dv NETISR_POLICY_CPU .
+.It Vt netisr_drainedcpu_t Va nh_drainedcpu
+Optional callback function that will be invoked when a per-CPU queue
+was drained.
+It will never fire for directly dispatched packets.
+Unless fully understood, this special-purpose function should not be used.
+.\" In case you intend to use this please send 50 chocolate bars to each
+.\" of rwatson and bz and wait for an answer.
.It Vt u_int Va nh_proto
Protocol number used by both protocols to identify themselves to
.Nm ,
==== //depot/projects/smpng/sys/amd64/amd64/msi.c#11 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.10 2009/01/29 09:22:56 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.11 2009/06/15 13:47:49 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -210,6 +210,8 @@
old_id = msi->msi_cpu;
if (old_vector && old_id == apic_id)
return;
+ if (old_vector && !msi->msi_msix && msi->msi_first->msi_count > 1)
+ return;
/* Allocate IDT vector on this cpu. */
vector = apic_alloc_vector(apic_id, msi->msi_irq);
if (vector == 0)
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#95 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.660 2009/06/08 18:23:43 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.661 2009/06/14 19:51:43 alc Exp $");
/*
* Manages physical address maps.
@@ -3322,78 +3322,74 @@
pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
vm_pindex_t pindex, vm_size_t size)
{
- vm_offset_t va;
+ pd_entry_t *pde;
+ vm_paddr_t pa, ptepa;
vm_page_t p, pdpg;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
KASSERT(object->type == OBJT_DEVICE,
("pmap_object_init_pt: non-device object"));
- if (((addr & (NBPDR - 1)) == 0) && ((size & (NBPDR - 1)) == 0)) {
- vm_page_t m[1];
- pd_entry_t ptepa, *pde;
-
- PMAP_LOCK(pmap);
- pde = pmap_pde(pmap, addr);
- if (pde != 0 && (*pde & PG_V) != 0)
- goto out;
- PMAP_UNLOCK(pmap);
-retry:
+ if ((addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 0) {
+ if (!vm_object_populate(object, pindex, pindex + atop(size)))
+ return;
p = vm_page_lookup(object, pindex);
- if (p != NULL) {
- if (vm_page_sleep_if_busy(p, FALSE, "init4p"))
- goto retry;
- } else {
- p = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL);
- if (p == NULL)
- return;
- m[0] = p;
+ KASSERT(p->valid == VM_PAGE_BITS_ALL,
+ ("pmap_object_init_pt: invalid page %p", p));
- if (vm_pager_get_pages(object, m, 1, 0) != VM_PAGER_OK) {
- vm_page_lock_queues();
- vm_page_free(p);
- vm_page_unlock_queues();
- return;
- }
-
- p = vm_page_lookup(object, pindex);
- vm_page_wakeup(p);
- }
-
+ /*
+ * Abort the mapping if the first page is not physically
+ * aligned to a 2MB page boundary.
+ */
ptepa = VM_PAGE_TO_PHYS(p);
if (ptepa & (NBPDR - 1))
return;
- p->valid = VM_PAGE_BITS_ALL;
+ /*
+ * Skip the first page. Abort the mapping if the rest of
+ * the pages are not physically contiguous.
+ */
+ p = TAILQ_NEXT(p, listq);
+ for (pa = ptepa + PAGE_SIZE; pa < ptepa + size;
+ pa += PAGE_SIZE) {
+ KASSERT(p->valid == VM_PAGE_BITS_ALL,
+ ("pmap_object_init_pt: invalid page %p", p));
+ if (pa != VM_PAGE_TO_PHYS(p))
+ return;
+ p = TAILQ_NEXT(p, listq);
+ }
+ /* Map using 2MB pages. */
PMAP_LOCK(pmap);
- for (va = addr; va < addr + size; va += NBPDR) {
- while ((pdpg =
- pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) {
- PMAP_UNLOCK(pmap);
- vm_page_busy(p);
- VM_OBJECT_UNLOCK(object);
- VM_WAIT;
- VM_OBJECT_LOCK(object);
- vm_page_wakeup(p);
- PMAP_LOCK(pmap);
+ for (pa = ptepa; pa < ptepa + size; pa += NBPDR) {
+ pdpg = pmap_allocpde(pmap, addr, M_NOWAIT);
+ if (pdpg == NULL) {
+ /*
+ * The creation of mappings below is only an
+ * optimization. If a page directory page
+ * cannot be allocated without blocking,
+ * continue on to the next mapping rather than
+ * blocking.
+ */
+ addr += NBPDR;
+ continue;
}
pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pdpg));
- pde = &pde[pmap_pde_index(va)];
+ pde = &pde[pmap_pde_index(addr)];
if ((*pde & PG_V) == 0) {
- pde_store(pde, ptepa | PG_PS | PG_M | PG_A |
+ pde_store(pde, pa | PG_PS | PG_M | PG_A |
PG_U | PG_RW | PG_V);
- pmap->pm_stats.resident_count +=
- NBPDR / PAGE_SIZE;
+ pmap->pm_stats.resident_count += NBPDR /
+ PAGE_SIZE;
+ pmap_pde_mappings++;
} else {
+ /* Continue on if the PDE is already valid. */
pdpg->wire_count--;
KASSERT(pdpg->wire_count > 0,
("pmap_object_init_pt: missing reference "
- "to page directory page, va: 0x%lx", va));
+ "to page directory page, va: 0x%lx", addr));
}
- ptepa += NBPDR;
+ addr += NBPDR;
}
- pmap_invalidate_all(pmap);
-out:
PMAP_UNLOCK(pmap);
}
}
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#80 (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.528 2009/06/10 02:07:58 yongari Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.529 2009/06/14 18:01:35 ed Exp $
cpu HAMMER
ident GENERIC
@@ -66,6 +66,7 @@
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options STOP_NMI # Stop CPUS using NMI instead of IPI
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
==== //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.20 2009/05/14 21:53:35 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.21 2009/06/15 21:55:29 ps Exp $
hint.fdc.0.at="isa"
hint.fdc.0.port="0x3F0"
hint.fdc.0.irq="6"
@@ -24,3 +24,6 @@
hint.uart.1.irq="3"
hint.ppc.0.at="isa"
hint.ppc.0.irq="7"
+hint.atrtc.0.at="isa"
+hint.atrtc.0.port="0x70"
+hint.atrtc.0.irq="8"
==== //depot/projects/smpng/sys/arm/mv/common.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.6 2009/04/16 11:20:18 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.7 2009/06/12 20:00:38 marcel Exp $");
#include <sys/systm.h>
#include <sys/bus.h>
@@ -39,6 +39,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
static int win_eth_can_remap(int i);
==== //depot/projects/smpng/sys/arm/mv/discovery/db78xxx.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.3 2009/01/08 18:31:43 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/db78xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
/*
* Virtual address space layout:
==== //depot/projects/smpng/sys/arm/mv/discovery/discovery.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.4 2009/01/08 18:31:43 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.5 2009/06/12 20:00:38 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
#define _MV_PCIE_MAX_PORT 8
==== //depot/projects/smpng/sys/arm/mv/kirkwood/db88f6xxx.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.3 2009/01/08 18:31:43 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/db88f6xxx.c,v 1.4 2009/06/12 20:00:38 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
/*
* Virtual address space layout:
==== //depot/projects/smpng/sys/arm/mv/kirkwood/kirkwood.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/kirkwood.c,v 1.4 2009/01/08 18:31:43 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/kirkwood.c,v 1.5 2009/06/12 20:00:38 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
struct obio_device obio_devices[] = {
{ "ic", MV_IC_BASE, MV_IC_SIZE,
==== //depot/projects/smpng/sys/arm/mv/mvreg.h#5 (text+ko) ====
@@ -28,126 +28,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.5 2009/04/16 11:20:18 raj Exp $
+ * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.6 2009/06/12 20:00:38 marcel Exp $
*/
#ifndef _MVREG_H_
#define _MVREG_H_
-#include <machine/intr.h>
-
-/*
- * Physical addresses of integrated SoC peripherals
- */
-#define MV_PHYS_BASE 0xF1000000
-#define MV_SIZE 0x100000
-
-/*
- * Decode windows addresses (physical)
- */
-#define MV_PCIE_IO_PHYS_BASE (MV_PHYS_BASE + MV_SIZE)
-#define MV_PCIE_IO_BASE MV_PCIE_IO_PHYS_BASE
-#define MV_PCIE_IO_SIZE (1024 * 1024)
-#define MV_PCI_IO_PHYS_BASE (MV_PCIE_IO_PHYS_BASE + MV_PCIE_IO_SIZE)
-#define MV_PCI_IO_BASE MV_PCI_IO_PHYS_BASE
-#define MV_PCI_IO_SIZE (1024 * 1024)
-
-#define MV_PCIE_MEM_PHYS_BASE (MV_PCI_IO_PHYS_BASE + MV_PCI_IO_SIZE)
-#define MV_PCIE_MEM_BASE MV_PCIE_MEM_PHYS_BASE
-#define MV_PCIE_MEM_SIZE (64 * 1024 * 1024)
-#define MV_PCI_MEM_PHYS_BASE (MV_PCIE_MEM_PHYS_BASE + MV_PCIE_MEM_SIZE)
-#define MV_PCI_MEM_BASE MV_PCI_MEM_PHYS_BASE
-#define MV_PCI_MEM_SIZE (64 * 1024 * 1024)
-
-/* XXX DEV_BOOT, CSx are board specific, should be defined per platform */
-
-/* 512KB NOR FLASH */
-#define MV_DEV_BOOT_PHYS_BASE (MV_PCI_MEM_PHYS_BASE + MV_PCI_MEM_SIZE)
-#define MV_DEV_BOOT_SIZE (512 * 1024)
-/* CS0: 7-seg LED */
-#define MV_DEV_CS0_PHYS_BASE 0xFA000000
-#define MV_DEV_CS0_SIZE (1024 * 1024) /* XXX u-boot has 2MB */
-/* CS1: 32MB NOR FLASH */
-#define MV_DEV_CS1_PHYS_BASE (MV_DEV_CS0_PHYS_BASE + MV_DEV_CS0_SIZE)
-#define MV_DEV_CS1_SIZE (32 * 1024 * 1024)
-/* CS2: 32MB NAND FLASH */
-#define MV_DEV_CS2_PHYS_BASE (MV_DEV_CS1_PHYS_BASE + MV_DEV_CS1_SIZE)
-#define MV_DEV_CS2_SIZE 1024 /* XXX u-boot has 1MB */
-
-#define MV_CESA_SRAM_PHYS_BASE 0xFD000000
-#define MV_CESA_SRAM_BASE MV_CESA_SRAM_PHYS_BASE /* VA == PA mapping */
-#define MV_CESA_SRAM_SIZE (1024 * 1024)
-
-/* XXX this is probably not robust against wraparounds... */
-#if ((MV_CESA_SRAM_PHYS_BASE + MV_CESA_SRAM_SIZE) > 0xFFFEFFFF)
-#error Devices memory layout overlaps reset vectors range!
-#endif
-
-/*
- * Integrated SoC peripherals addresses
- */
-#define MV_BASE MV_PHYS_BASE /* VA == PA mapping */
-#define MV_DDR_CADR_BASE (MV_BASE + 0x1500)
-#define MV_MPP_BASE (MV_BASE + 0x10000)
-#define MV_GPIO_BASE (MV_BASE + 0x10100)
-#define MV_GPIO_SIZE 0x20
-#define MV_RTC_BASE (MV_BASE + 0x10300)
-#define MV_RTC_SIZE 0x08
-#define MV_TWSI_BASE (MV_BASE + 0x11000)
-#define MV_TWSI_SIZE 0x20
-#define MV_UART0_BASE (MV_BASE + 0x12000)
-#define MV_UART1_BASE (MV_BASE + 0x12100)
-#define MV_UART_SIZE 0x20
-#define MV_MBUS_BRIDGE_BASE (MV_BASE + 0x20000)
-#define MV_INTREGS_BASE (MV_MBUS_BRIDGE_BASE + 0x80)
-#define MV_CPU_CONTROL_BASE (MV_MBUS_BRIDGE_BASE + 0x100)
-#define MV_IC_BASE (MV_MBUS_BRIDGE_BASE + 0x200)
-#define MV_IC_SIZE 0x3C
-#define MV_TIMERS_BASE (MV_MBUS_BRIDGE_BASE + 0x300)
-#define MV_TIMERS_SIZE 0x30
-#define MV_PCI_BASE (MV_BASE + 0x30000)
-#define MV_PCI_SIZE 0x2000
-#if defined (SOC_MV_KIRKWOOD)
-#define MV_CESA_BASE (MV_BASE + 0x30000) /* CESA,PCI don't coexist */
-#elif defined (SOC_MV_ORION) || defined(SOC_MV_DISCOVERY)
-#define MV_CESA_BASE (MV_BASE + 0x90000)
-#endif
-#define MV_CESA_SIZE 0x10000
-#define MV_PCIE_BASE (MV_BASE + 0x40000)
-#define MV_PCIE_SIZE 0x2000
-
-#define MV_PCIE00_BASE (MV_PCIE_BASE + 0x00000)
-#define MV_PCIE01_BASE (MV_PCIE_BASE + 0x04000)
-#define MV_PCIE02_BASE (MV_PCIE_BASE + 0x08000)
-#define MV_PCIE03_BASE (MV_PCIE_BASE + 0x0C000)
-#define MV_PCIE10_BASE (MV_PCIE_BASE + 0x40000)
-#define MV_PCIE11_BASE (MV_PCIE_BASE + 0x44000)
-#define MV_PCIE12_BASE (MV_PCIE_BASE + 0x48000)
-#define MV_PCIE13_BASE (MV_PCIE_BASE + 0x4C000)
-
-#define MV_USB0_BASE (MV_BASE + 0x50000)
-#define MV_USB1_BASE (MV_USB0_BASE + 0x1000)
-#define MV_USB2_BASE (MV_USB0_BASE + 0x2000)
-#define MV_USB_SIZE 0x1000
-#define MV_USB_HOST_OFST 0x0100 /* EHCI HC regs start at this offset within USB range */
-#define MV_USB_AWR_BASE (MV_USB0_BASE + 0x320)
-#define MV_IDMA_BASE (MV_BASE + 0x60000)
-#define MV_IDMA_SIZE 0x1000
-#define MV_XOR_BASE (MV_BASE + 0x60000)
-#define MV_XOR_SIZE 0x1000
-#define MV_ETH0_BASE (MV_BASE + 0x72000)
-#define MV_ETH1_BASE (MV_BASE + 0x76000)
-#define MV_ETH_SIZE 0x2000
-#if defined(SOC_MV_ORION) || defined(SOC_MV_KIRKWOOD)
-#define MV_SATAHC_BASE (MV_BASE + 0x80000)
-#define MV_SATAHC_SIZE 0x6000
-#elif defined(SOC_MV_DISCOVERY)
-#define MV_SATAHC_BASE (MV_BASE + 0xA0000)
-#define MV_SATAHC_SIZE 0x6000
-#endif
-
-#define MV_DEV_CS0_BASE MV_DEV_CS0_PHYS_BASE
-
/*
* Interrupt sources
*/
@@ -478,135 +364,4 @@
#define MV_DEV_MV78100_Z0 0x6381
#define MV_DEV_MV78100 0x7810
-/*
- * Decode windows definitions and macros
- */
-#define MV_WIN_CPU_CTRL(n) (0x10 * (n) + (((n) < 8) ? 0x000 : 0x880))
-#define MV_WIN_CPU_BASE(n) (0x10 * (n) + (((n) < 8) ? 0x004 : 0x884))
-#define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + (((n) < 8) ? 0x008 : 0x888))
-#define MV_WIN_CPU_REMAP_HI(n) (0x10 * (n) + (((n) < 8) ? 0x00C : 0x88C))
-#if defined(SOC_MV_DISCOVERY)
-#define MV_WIN_CPU_MAX 14
-#else
-#define MV_WIN_CPU_MAX 8
-#endif
-
-#define MV_WIN_DDR_BASE(n) (0x8 * (n) + 0x0)
-#define MV_WIN_DDR_SIZE(n) (0x8 * (n) + 0x4)
-#define MV_WIN_DDR_MAX 4
-
-#define MV_WIN_CESA_CTRL(n) (0x8 * (n) + 0xa04)
-#define MV_WIN_CESA_BASE(n) (0x8 * (n) + 0xa00)
-#define MV_WIN_CESA_MAX 4
-
-#define MV_WIN_USB_CTRL(n, m) (0x10 * (n) + (m) * 0x1000 + 0x0)
-#define MV_WIN_USB_BASE(n, m) (0x10 * (n) + (m) * 0x1000 + 0x4)
-#define MV_WIN_USB_MAX 4
-
-#define MV_WIN_ETH_BASE(n) (0x8 * (n) + 0x200)
-#define MV_WIN_ETH_SIZE(n) (0x8 * (n) + 0x204)
-#define MV_WIN_ETH_REMAP(n) (0x4 * (n) + 0x280)
-#define MV_WIN_ETH_MAX 6
-
-#define MV_WIN_IDMA_BASE(n) (0x8 * (n) + 0xa00)
-#define MV_WIN_IDMA_SIZE(n) (0x8 * (n) + 0xa04)
-#define MV_WIN_IDMA_REMAP(n) (0x4 * (n) + 0xa60)
-#define MV_WIN_IDMA_CAP(n) (0x4 * (n) + 0xa70)
-#define MV_WIN_IDMA_MAX 8
-#define MV_IDMA_CHAN_MAX 4
-
-#define MV_WIN_XOR_BASE(n, m) (0x4 * (n) + 0xa50 + (m) * 0x100)
-#define MV_WIN_XOR_SIZE(n, m) (0x4 * (n) + 0xa70 + (m) * 0x100)
-#define MV_WIN_XOR_REMAP(n, m) (0x4 * (n) + 0xa90 + (m) * 0x100)
-#define MV_WIN_XOR_CTRL(n, m) (0x4 * (n) + 0xa40 + (m) * 0x100)
-#define MV_WIN_XOR_OVERR(n, m) (0x4 * (n) + 0xaa0 + (m) * 0x100)
-#define MV_WIN_XOR_MAX 8
-#define MV_XOR_CHAN_MAX 2
-#define MV_XOR_NON_REMAP 4
-
-#define MV_WIN_PCIE_CTRL(n) (0x10 * (((n) < 5) ? (n) : \
- (n) + 1) + 0x1820)
-#define MV_WIN_PCIE_BASE(n) (0x10 * (((n) < 5) ? (n) : \
- (n) + 1) + 0x1824)
-#define MV_WIN_PCIE_REMAP(n) (0x10 * (((n) < 5) ? (n) : \
- (n) + 1) + 0x182C)
-#define MV_WIN_PCIE_MAX 6
-
-#define MV_PCIE_BAR(n) (0x04 * (n) + 0x1804)
-#define MV_PCIE_BAR_MAX 3
-
-#define MV_WIN_SATA_CTRL(n) (0x10 * (n) + 0x30)
-#define MV_WIN_SATA_BASE(n) (0x10 * (n) + 0x34)
-#define MV_WIN_SATA_MAX 4
-
-#define WIN_REG_IDX_RD(pre,reg,off,base) \
- static __inline uint32_t \
- pre ## _ ## reg ## _read(int i) \
- { \
- return (bus_space_read_4(obio_tag, base, off(i))); \
- }
-
-#define WIN_REG_IDX_RD2(pre,reg,off,base) \
- static __inline uint32_t \
- pre ## _ ## reg ## _read(int i, int j) \
- { \
- return (bus_space_read_4(obio_tag, base, off(i, j))); \
- } \
-
-#define WIN_REG_BASE_IDX_RD(pre,reg,off) \
- static __inline uint32_t \
- pre ## _ ## reg ## _read(uint32_t base, int i) \
- { \
- return (bus_space_read_4(obio_tag, base, off(i))); \
- }
-
-#define WIN_REG_IDX_WR(pre,reg,off,base) \
- static __inline void \
- pre ## _ ## reg ## _write(int i, uint32_t val) \
- { \
- bus_space_write_4(obio_tag, base, off(i), val); \
- }
-
-#define WIN_REG_IDX_WR2(pre,reg,off,base) \
- static __inline void \
- pre ## _ ## reg ## _write(int i, int j, uint32_t val) \
- { \
- bus_space_write_4(obio_tag, base, off(i, j), val); \
- }
-
-#define WIN_REG_BASE_IDX_WR(pre,reg,off) \
- static __inline void \
- pre ## _ ## reg ## _write(uint32_t base, int i, uint32_t val) \
- { \
- bus_space_write_4(obio_tag, base, off(i), val); \
- }
-
-#define WIN_REG_RD(pre,reg,off,base) \
- static __inline uint32_t \
- pre ## _ ## reg ## _read(void) \
- { \
- return (bus_space_read_4(obio_tag, base, off)); \
- }
-
-#define WIN_REG_BASE_RD(pre,reg,off) \
- static __inline uint32_t \
- pre ## _ ## reg ## _read(uint32_t base) \
- { \
- return (bus_space_read_4(obio_tag, base, off)); \
- }
-
-#define WIN_REG_WR(pre,reg,off,base) \
- static __inline void \
- pre ## _ ## reg ## _write(uint32_t val) \
- { \
- bus_space_write_4(obio_tag, base, off, val); \
- }
-
-#define WIN_REG_BASE_WR(pre,reg,off) \
- static __inline void \
- pre ## _ ## reg ## _write(uint32_t base, uint32_t val) \
- { \
- bus_space_write_4(obio_tag, base, off, val); \
- }
-
#endif /* _MVREG_H_ */
==== //depot/projects/smpng/sys/arm/mv/orion/db88f5xxx.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.4 2009/01/09 10:20:51 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/orion/db88f5xxx.c,v 1.5 2009/06/12 20:00:38 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,12 +41,14 @@
#include <vm/pmap.h>
#include <machine/bus.h>
+#include <machine/intr.h>
#include <machine/pte.h>
#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
/*
* Virtual address space layout:
==== //depot/projects/smpng/sys/arm/mv/orion/orion.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/orion/orion.c,v 1.5 2009/01/09 10:20:51 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/orion/orion.c,v 1.6 2009/06/12 20:00:38 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,7 @@
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>
+#include <arm/mv/mvwin.h>
extern const struct obio_pci_irq_map pci_irq_map[];
==== //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#14 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.18 2009/06/11 17:05:13 avg Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list