Date: Thu, 25 Jun 2009 10:15:06 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 165146 for review Message-ID: <200906251015.n5PAF6g8071091@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165146 Change 165146 by hselasky@hselasky_laptop001 on 2009/06/25 10:14:54 IFC @ 165143 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#17 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#20 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#23 integrate .. //depot/projects/usb/src/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#17 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#5 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#5 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#5 integrate .. //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#5 integrate .. //depot/projects/usb/src/sys/arm/mv/files.mv#6 integrate .. //depot/projects/usb/src/sys/arm/mv/kirkwood/kirkwood.c#5 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_sata.c#1 branch .. //depot/projects/usb/src/sys/arm/mv/mvreg.h#6 integrate .. //depot/projects/usb/src/sys/arm/mv/mvwin.h#2 integrate .. //depot/projects/usb/src/sys/arm/mv/orion/orion.c#5 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#9 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/crb_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_ata.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#15 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/cambria_exp_space.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425.c#12 integrate .. //depot/projects/usb/src/sys/arm/xscale/pxa/pxa_machdep.c#5 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ipc.h#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#14 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/usb/src/sys/conf/files#70 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#22 integrate .. //depot/projects/usb/src/sys/conf/files.i386#27 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#13 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#11 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#16 integrate .. //depot/projects/usb/src/sys/contrib/rdma/rdma_addr.c#3 integrate .. //depot/projects/usb/src/sys/contrib/rdma/rdma_cma.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_hp.c#1 branch .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_wmi.c#1 branch .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_wmi_if.m#1 branch .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#21 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acard.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-adaptec.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-amd.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cenatek.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cypress.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cyrix.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-highpoint.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ite.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-micron.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-national.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-netcell.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#5 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#20 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#13 integrate .. //depot/projects/usb/src/sys/dev/cas/if_cas.c#2 integrate .. //depot/projects/usb/src/sys/dev/cas/if_casvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#21 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#8 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#13 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#12 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_irq.c#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#4 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#10 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_sbus.c#1 branch .. //depot/projects/usb/src/sys/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gemvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#29 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82599.c#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#7 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#13 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#15 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.h#5 integrate .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.h#5 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#13 integrate .. //depot/projects/usb/src/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/usb/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#31 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#20 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#8 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#10 integrate .. //depot/projects/usb/src/sys/geom/geom_redboot.c#3 integrate .. //depot/projects/usb/src/sys/geom/linux_lvm/g_linux_lvm.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_rw.h#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/xfs_vnodeops.c#5 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#23 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#17 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#19 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate .. //depot/projects/usb/src/sys/i386/isa/clock.c#11 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#11 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#9 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_switch.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#9 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#14 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#14 integrate .. //depot/projects/usb/src/sys/kern/makesyscalls.sh#10 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#17 integrate .. //depot/projects/usb/src/sys/kern/subr_pcpu.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#7 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#11 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#14 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#14 integrate .. //depot/projects/usb/src/sys/kern/systrace_args.c#12 integrate .. //depot/projects/usb/src/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/usb/src/sys/kern/sysv_msg.c#10 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#12 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#11 integrate .. //depot/projects/usb/src/sys/kern/tty.c#27 integrate .. //depot/projects/usb/src/sys/kern/uipc_shm.c#7 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#11 integrate .. //depot/projects/usb/src/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi_hp/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/acpi/acpi_wmi/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/gem/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/igb/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/ixgbe/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/mxge/mxge/Makefile#3 integrate .. //depot/projects/usb/src/sys/net/bridgestp.c#15 integrate .. //depot/projects/usb/src/sys/net/if.c#31 integrate .. //depot/projects/usb/src/sys/net/if_ef.c#9 integrate .. //depot/projects/usb/src/sys/net/if_epair.c#1 branch .. //depot/projects/usb/src/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/usb/src/sys/net/if_fddisubr.c#12 integrate .. //depot/projects/usb/src/sys/net/if_media.h#10 integrate .. //depot/projects/usb/src/sys/net/if_mib.c#9 integrate .. //depot/projects/usb/src/sys/net/if_spppsubr.c#11 integrate .. //depot/projects/usb/src/sys/net/if_stf.c#12 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#15 integrate .. //depot/projects/usb/src/sys/net/raw_cb.c#12 integrate .. //depot/projects/usb/src/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/usb/src/sys/net/route.c#20 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#27 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#24 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#17 integrate .. //depot/projects/usb/src/sys/netatalk/aarp.c#7 integrate .. //depot/projects/usb/src/sys/netatalk/at_control.c#6 integrate .. //depot/projects/usb/src/sys/netatalk/at_extern.h#4 integrate .. //depot/projects/usb/src/sys/netatalk/at_rmx.c#3 integrate .. //depot/projects/usb/src/sys/netatalk/at_var.h#4 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_input.c#7 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_output.c#6 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_pcb.c#6 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/atm/ng_atm.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#12 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#22 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#19 integrate .. //depot/projects/usb/src/sys/netinet/in.c#28 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#27 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#21 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#18 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#13 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#19 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#26 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#14 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#23 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#13 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.c#6 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#21 integrate .. //depot/projects/usb/src/sys/netinet6/frag6.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#26 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#24 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.h#6 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#24 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#16 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/scope6.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#21 integrate .. //depot/projects/usb/src/sys/netinet6/vinet6.h#9 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#20 integrate .. //depot/projects/usb/src/sys/netipx/ipx.c#7 integrate .. //depot/projects/usb/src/sys/netipx/ipx_if.h#6 integrate .. //depot/projects/usb/src/sys/netipx/ipx_input.c#8 integrate .. //depot/projects/usb/src/sys/netipx/ipx_outputfl.c#6 integrate .. //depot/projects/usb/src/sys/netipx/ipx_pcb.c#6 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mp_machdep.c#8 integrate .. //depot/projects/usb/src/sys/rpc/clnt_rc.c#7 integrate .. //depot/projects/usb/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#2 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#21 integrate .. //depot/projects/usb/src/sys/sparc64/include/pcpu.h#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#15 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/usb/src/sys/sun4v/include/pcpu.h#8 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/machdep.c#9 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/mp_machdep.c#6 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/pmap.c#7 integrate .. //depot/projects/usb/src/sys/sys/ata.h#5 integrate .. //depot/projects/usb/src/sys/sys/ipc.h#3 integrate .. //depot/projects/usb/src/sys/sys/jail.h#17 integrate .. //depot/projects/usb/src/sys/sys/linker.h#5 integrate .. //depot/projects/usb/src/sys/sys/msg.h#2 integrate .. //depot/projects/usb/src/sys/sys/param.h#38 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#12 integrate .. //depot/projects/usb/src/sys/sys/priv.h#19 integrate .. //depot/projects/usb/src/sys/sys/resource.h#6 integrate .. //depot/projects/usb/src/sys/sys/resourcevar.h#5 integrate .. //depot/projects/usb/src/sys/sys/sched.h#8 integrate .. //depot/projects/usb/src/sys/sys/sem.h#4 integrate .. //depot/projects/usb/src/sys/sys/shm.h#5 integrate .. //depot/projects/usb/src/sys/sys/stack.h#4 integrate .. //depot/projects/usb/src/sys/sys/syscall.h#14 integrate .. //depot/projects/usb/src/sys/sys/syscall.mk#14 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#19 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#14 integrate .. //depot/projects/usb/src/sys/sys/tty.h#11 integrate .. //depot/projects/usb/src/sys/vm/default_pager.c#2 integrate .. //depot/projects/usb/src/sys/vm/device_pager.c#8 integrate .. //depot/projects/usb/src/sys/vm/phys_pager.c#6 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#16 integrate .. //depot/projects/usb/src/sys/vm/vm.h#4 integrate .. //depot/projects/usb/src/sys/vm/vm_phys.c#5 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.56 2009/06/09 04:17:36 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.57 2009/06/24 19:16:48 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -897,6 +897,7 @@ apic_free_vector(u_int apic_id, u_int vector, u_int irq) { struct thread *td; + KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#20 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.702 2009/06/09 04:17:36 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.703 2009/06/23 22:42:39 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1501,6 +1501,8 @@ wrmsr(MSR_KGSBASE, 0); /* User value while in the kernel */ pcpu_init(pc, 0, sizeof(struct pcpu)); + dpcpu_init((void *)(physfree + KERNBASE), 0); + physfree += DPCPU_SIZE; PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.308 2009/05/14 17:43:00 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.309 2009/06/23 22:42:39 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -93,9 +93,10 @@ /* Free these after use */ void *bootstacks[MAXCPU]; -/* Temporary holder for double fault stack */ +/* Temporary variables for init_secondary() */ char *doublefault_stack; char *nmi_stack; +void *dpcpu; /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -590,6 +591,7 @@ /* prime data page for it to use */ pcpu_init(pc, cpu, sizeof(struct pcpu)); + dpcpu_init(dpcpu, cpu); pc->pc_apic_id = cpu_apic_ids[cpu]; pc->pc_prvspace = pc; pc->pc_curthread = 0; @@ -885,6 +887,7 @@ bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); nmi_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); + dpcpu = (void *)kmem_alloc(kernel_map, DPCPU_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; ==== //depot/projects/usb/src/sys/amd64/isa/clock.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.248 2009/06/09 09:47:02 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.251 2009/06/23 23:16:37 mav Exp $"); /* * Routines to handle clock hardware. @@ -93,9 +93,6 @@ static int using_atrtc_timer; static int using_lapic_timer; -static u_int stat_ticks = 0; -static u_int prof_ticks = 0; - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 @@ -132,6 +129,7 @@ statclockintr(struct trapframe *frame) { + profclockintr(frame); statclock(TRAPF_USERMODE(frame)); return (FILTER_HANDLED); } @@ -140,7 +138,10 @@ profclockintr(struct trapframe *frame) { - profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + if (!using_atrtc_timer) + hardclockintr(frame); + if (profprocs != 0) + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); return (FILTER_HANDLED); } @@ -160,32 +161,27 @@ mtx_unlock_spin(&clock_lock); } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); -#ifdef SMP - if (smp_started) - ipi_all_but_self(IPI_HARDCLOCK); -#endif - hardclockintr(frame); - if (!using_atrtc_timer) { - prof_ticks += profhz; - if (prof_ticks >= hz) { - prof_ticks -= hz; - if (profprocs != 0) { + if (using_atrtc_timer) { #ifdef SMP - if (smp_started) - ipi_all_but_self(IPI_PROFCLOCK); + if (smp_started) + ipi_all_but_self(IPI_HARDCLOCK); #endif - profclockintr(frame); - } - } - stat_ticks += stathz; - if (stat_ticks >= hz) { - stat_ticks -= hz; + hardclockintr(frame); + } else { + if (--pscnt <= 0) { + pscnt = psratio; #ifdef SMP if (smp_started) ipi_all_but_self(IPI_STATCLOCK); #endif statclockintr(frame); + } else { +#ifdef SMP + if (smp_started) + ipi_all_but_self(IPI_PROFCLOCK); +#endif + profclockintr(frame); } } @@ -266,21 +262,19 @@ while (rtcin(RTC_INTR) & RTCIR_PERIOD) { flag = 1; - if (profprocs != 0) { - if (--pscnt == 0) - pscnt = psdiv; + if (--pscnt <= 0) { + pscnt = psdiv; #ifdef SMP - if (pscnt != psdiv && smp_started) - ipi_all_but_self(IPI_PROFCLOCK); + if (smp_started) + ipi_all_but_self(IPI_STATCLOCK); #endif - profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); - } - if (pscnt == psdiv) { + statclockintr(frame); + } else { #ifdef SMP if (smp_started) - ipi_all_but_self(IPI_STATCLOCK); + ipi_all_but_self(IPI_PROFCLOCK); #endif - statclock(TRAPF_USERMODE(frame)); + profclockintr(frame); } } return(flag ? FILTER_HANDLED : FILTER_STRAY); @@ -523,8 +517,11 @@ INTR_TYPE_CLK, NULL); atrtc_enable_intr(); } else { - profhz = min(RTC_PROFRATE, hz); - stathz = min(RTC_NOPROFRATE, hz); + profhz = hz; + if (hz < 128) + stathz = hz; + else + stathz = hz / (hz / 128); } } ==== //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.12 2009/04/05 09:27:19 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.13 2009/06/23 22:42:39 jeff Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -149,7 +149,7 @@ if (local) { if (rtype == R_ARM_RELATIVE) { /* A + B */ - addr = relocbase + addend; + addr = elf_relocaddr(lf, relocbase + addend); if (*where != addr) *where = addr; } ==== //depot/projects/usb/src/sys/arm/arm/pmap.c#17 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.110 2009/06/18 20:42:37 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.111 2009/06/24 21:03:59 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -2947,7 +2947,7 @@ } /* - * remove a page rom the kernel pagetables + * remove a page from the kernel pagetables */ void pmap_kremove(vm_offset_t va) ==== //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.38 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.39 2009/06/24 21:00:13 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -483,7 +483,7 @@ int i; vm_offset_t addr = alloc_firstaddr; - KASSERT(alloc_firstaddr != 0, ("arm_ptovirt called to early ?")); + KASSERT(alloc_firstaddr != 0, ("arm_ptovirt called too early ?")); for (i = 0; dump_avail[i + 1]; i += 2) { if (pa >= dump_avail[i] && pa < dump_avail[i + 1]) break; ==== //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "opt_msgbuf.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.4 2009/04/22 23:54:41 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.5 2009/06/23 22:42:39 jeff Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -215,6 +215,7 @@ initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; + struct pv_addr dpcpu; int loop, i; u_int l1pagetable; vm_offset_t freemempos; @@ -264,6 +265,10 @@ */ valloc_pages(systempage, 1); + /* Allocate dynamic per-cpu area. */ + valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); + dpcpu_init((void *)dpcpu.pv_va, 0); + /* Allocate stacks for all modes */ valloc_pages(irqstack, IRQ_STACK_SIZE); valloc_pages(abtstack, ABT_STACK_SIZE); ==== //depot/projects/usb/src/sys/arm/conf/DB-78XXX#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.5 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.6 2009/06/24 15:41:18 raj Exp $ # ident DB-88F78XX @@ -77,3 +77,7 @@ device iic device iicbus device ds133x + +# SATA +device ata +device atadisk ==== //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-88F5xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.5 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.6 2009/06/24 15:41:18 raj Exp $ # ident DB-88F5XXX @@ -79,3 +79,7 @@ device scbus device pass device da + +# SATA +device ata +device atadisk ==== //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-88F6xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.5 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.6 2009/06/24 15:41:18 raj Exp $ # ident DB-88F6XXX @@ -76,3 +76,7 @@ # I2C (TWSI) device iic device iicbus + +# SATA +device ata +device atadisk ==== //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/discovery/discovery.c,v 1.7 2009/06/25 10:03:51 raj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -126,10 +126,19 @@ { -1 }, CPU_PM_CTRL_GE1 }, - { "twsi", MV_TWSI_BASE, MV_TWSI_SIZE, + { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE, + { -1 }, { -1 }, + CPU_PM_CTRL_NONE + }, + { "twsi", MV_TWSI1_BASE, MV_TWSI_SIZE, { -1 }, { -1 }, CPU_PM_CTRL_NONE }, + { "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE, + { MV_INT_SATA, -1 }, + { -1 }, + CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1 + }, { NULL, 0, 0, { 0 }, { 0 }, 0 } }; ==== //depot/projects/usb/src/sys/arm/mv/files.mv#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/files.mv,v 1.5 2009/02/24 23:30:52 thompsa Exp $ +# $FreeBSD: src/sys/arm/mv/files.mv,v 1.6 2009/06/24 15:41:18 raj Exp $ # # The Marvell CPU cores # - Compliant with V5TE architecture @@ -24,6 +24,7 @@ arm/mv/ic.c standard arm/mv/mv_machdep.c standard arm/mv/mv_pci.c optional pci +arm/mv/mv_sata.c optional ata | atamvsata arm/mv/obio.c standard arm/mv/timer.c standard arm/mv/twsi.c optional iicbus ==== //depot/projects/usb/src/sys/arm/mv/kirkwood/kirkwood.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/kirkwood.c,v 1.5 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/kirkwood/kirkwood.c,v 1.7 2009/06/25 10:03:51 raj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,10 +95,15 @@ { -1 }, CPU_PM_CTRL_GE0 }, - { "twsi", MV_TWSI_BASE, MV_TWSI_SIZE, + { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE, { -1 }, { -1 }, CPU_PM_CTRL_NONE }, + { "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE, + { MV_INT_SATA, -1 }, + { -1 }, + CPU_PM_CTRL_SATA0 | CPU_PM_CTRL_SATA1 + }, { NULL, 0, 0, { 0 }, { 0 }, 0 } }; ==== //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.4 2009/01/08 18:31:43 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.5 2009/06/23 22:42:39 jeff Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -358,6 +358,7 @@ initarm(void *mdp, void *unused __unused) { struct pv_addr kernel_l1pt; + struct pv_addr dpcpu; vm_offset_t freemempos, l2_start, lastaddr; uint32_t memsize, l2size; struct bi_mem_region *mr; @@ -479,6 +480,10 @@ */ valloc_pages(systempage, 1); + /* Allocate dynamic per-cpu area. */ + valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); + dpcpu_init((void *)dpcpu.pv_va, 0); + /* Allocate stacks for all modes */ valloc_pages(irqstack, IRQ_STACK_SIZE); valloc_pages(abtstack, ABT_STACK_SIZE); ==== //depot/projects/usb/src/sys/arm/mv/mvreg.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * 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.6 2009/06/12 20:00:38 marcel Exp $ + * $FreeBSD: src/sys/arm/mv/mvreg.h,v 1.7 2009/06/24 15:41:18 raj Exp $ */ #ifndef _MVREG_H_ @@ -274,6 +274,75 @@ #define CPU_TIMER0 0x14 /* + * SATA + */ +#define SATA_CHAN_NUM 2 + +#define EDMA_REGISTERS_OFFSET 0x2000 +#define EDMA_REGISTERS_SIZE 0x2000 +#define SATA_EDMA_BASE(ch) (EDMA_REGISTERS_OFFSET + \ + ((ch) * EDMA_REGISTERS_SIZE)) + +/* SATAHC registers */ +#define SATA_CR 0x000 /* Configuration Reg. */ +#define SATA_CR_NODMABS (1 << 8) +#define SATA_CR_NOEDMABS (1 << 9) +#define SATA_CR_NOPRDPBS (1 << 10) +#define SATA_CR_COALDIS(ch) (1 << (24 + ch)) + +#define SATA_ICR 0x014 /* Interrupt Cause Reg. */ +#define SATA_ICR_DMADONE(ch) (1 << (ch)) +#define SATA_ICR_COAL (1 << 4) +#define SATA_ICR_DEV(ch) (1 << (8 + ch)) + +#define SATA_MICR 0x020 /* Main Interrupt Cause Reg. */ +#define SATA_MICR_ERR(ch) (1 << (2 * ch)) +#define SATA_MICR_DONE(ch) (1 << ((2 * ch) + 1)) +#define SATA_MICR_DMADONE(ch) (1 << (4 + ch)) +#define SATA_MICR_COAL (1 << 8) + +#define SATA_MIMR 0x024 /* Main Interrupt Mask Reg. */ + +/* Shadow registers */ +#define SATA_SHADOWR_BASE(ch) (SATA_EDMA_BASE(ch) + 0x100) +#define SATA_SHADOWR_CONTROL(ch) (SATA_EDMA_BASE(ch) + 0x120) + +/* SATA registers */ +#define SATA_SATA_SSTATUS(ch) (SATA_EDMA_BASE(ch) + 0x300) +#define SATA_SATA_SERROR(ch) (SATA_EDMA_BASE(ch) + 0x304) +#define SATA_SATA_SCONTROL(ch) (SATA_EDMA_BASE(ch) + 0x308) +#define SATA_SATA_FISICR(ch) (SATA_EDMA_BASE(ch) + 0x364) + +/* EDMA registers */ +#define SATA_EDMA_CFG(ch) (SATA_EDMA_BASE(ch) + 0x000) +#define SATA_EDMA_CFG_QL128 (1 << 19) +#define SATA_EDMA_CFG_HQCACHE (1 << 22) + +#define SATA_EDMA_IECR(ch) (SATA_EDMA_BASE(ch) + 0x008) + +#define SATA_EDMA_IEMR(ch) (SATA_EDMA_BASE(ch) + 0x00C) +#define SATA_EDMA_REQBAHR(ch) (SATA_EDMA_BASE(ch) + 0x010) +#define SATA_EDMA_REQIPR(ch) (SATA_EDMA_BASE(ch) + 0x014) +#define SATA_EDMA_REQOPR(ch) (SATA_EDMA_BASE(ch) + 0x018) +#define SATA_EDMA_RESBAHR(ch) (SATA_EDMA_BASE(ch) + 0x01C) +#define SATA_EDMA_RESIPR(ch) (SATA_EDMA_BASE(ch) + 0x020) +#define SATA_EDMA_RESOPR(ch) (SATA_EDMA_BASE(ch) + 0x024) + +#define SATA_EDMA_CMD(ch) (SATA_EDMA_BASE(ch) + 0x028) +#define SATA_EDMA_CMD_ENABLE (1 << 0) +#define SATA_EDMA_CMD_DISABLE (1 << 1) +#define SATA_EDMA_CMD_RESET (1 << 2) + +#define SATA_EDMA_STATUS(ch) (SATA_EDMA_BASE(ch) + 0x030) +#define SATA_EDMA_STATUS_IDLE (1 << 7) + +/* Offset to extract input slot from REQIPR register */ +#define SATA_EDMA_REQIS_OFS 5 + +/* Offset to extract input slot from RESOPR register */ +#define SATA_EDMA_RESOS_OFS 3 + +/* * GPIO */ #define GPIO_DATA_OUT 0x00 ==== //depot/projects/usb/src/sys/arm/mv/mvwin.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/mv/mvwin.h,v 1.1 2009/06/12 20:00:38 marcel Exp $ + * $FreeBSD: src/sys/arm/mv/mvwin.h,v 1.2 2009/06/25 10:03:51 raj Exp $ */ #ifndef _MVWIN_H_ @@ -91,7 +91,8 @@ #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_TWSI0_BASE (MV_BASE + 0x11000) +#define MV_TWSI1_BASE (MV_BASE + 0x11100) #define MV_TWSI_SIZE 0x20 #define MV_UART0_BASE (MV_BASE + 0x12000) #define MV_UART1_BASE (MV_BASE + 0x12100) ==== //depot/projects/usb/src/sys/arm/mv/orion/orion.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/orion/orion.c,v 1.6 2009/06/12 20:00:38 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/orion/orion.c,v 1.8 2009/06/25 10:03:51 raj Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,10 +88,14 @@ { -1 }, CPU_PM_CTRL_NONE }, - { "twsi", MV_TWSI_BASE, MV_TWSI_SIZE, + { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE, { -1 }, { -1 }, CPU_PM_CTRL_NONE }, + { "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE, + { MV_INT_SATA, -1 }, { -1 }, + CPU_PM_CTRL_NONE + }, { NULL, 0, 0, { 0 } } }; ==== //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#8 (text+ko) ==== @@ -47,7 +47,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.28 2009/02/02 20:24:29 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.29 2009/06/23 22:42:39 jeff Exp $"); #include "opt_md.h" @@ -209,6 +209,7 @@ struct pv_addr kernel_l1pt; struct pv_addr md_addr; struct pv_addr md_bla; + struct pv_addr dpcpu; int loop; u_int l1pagetable; vm_offset_t freemempos; @@ -268,6 +269,10 @@ */ valloc_pages(systempage, 1); + /* Allocate dynamic per-cpu area. */ + valloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); + dpcpu_init((void *)dpcpu.pv_va, 0); + /* Allocate stacks for all modes */ valloc_pages(irqstack, IRQ_STACK_SIZE); valloc_pages(abtstack, ABT_STACK_SIZE); ==== //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.12 2008/12/01 10:16:25 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.13 2009/06/23 22:42:39 jeff Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -186,6 +186,7 @@ initarm(void *arg, void *arg2) { struct pv_addr kernel_l1pt; + struct pv_addr dpcpu; int loop, i; u_int l1pagetable; vm_offset_t freemempos; @@ -236,6 +237,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906251015.n5PAF6g8071091>