Date: Tue, 26 Apr 2011 00:20:04 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r221045 - in projects/altix/sys: amd64/amd64 amd64/conf amd64/include arm/at91 arm/conf arm/econa arm/mv/orion arm/xscale/i8134x boot/fdt/dts boot/forth boot/i386/gptzfsboot boot/i386/z... Message-ID: <201104260020.p3Q0K4bM098805@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Tue Apr 26 00:20:04 2011 New Revision: 221045 URL: http://svn.freebsd.org/changeset/base/221045 Log: Merge svn+ssh://svn.freebsd.org/base/head@221044 Added: projects/altix/sys/arm/conf/TS7800 - copied unchanged from r221044, head/sys/arm/conf/TS7800 projects/altix/sys/arm/mv/orion/files.ts7800 - copied unchanged from r221044, head/sys/arm/mv/orion/files.ts7800 projects/altix/sys/arm/mv/orion/std.ts7800 - copied unchanged from r221044, head/sys/arm/mv/orion/std.ts7800 projects/altix/sys/boot/fdt/dts/ts7800.dts - copied unchanged from r221044, head/sys/boot/fdt/dts/ts7800.dts projects/altix/sys/contrib/dev/acpica/compiler/dtparser.l - copied unchanged from r221044, head/sys/contrib/dev/acpica/compiler/dtparser.l projects/altix/sys/contrib/dev/acpica/compiler/dtparser.y - copied unchanged from r221044, head/sys/contrib/dev/acpica/compiler/dtparser.y projects/altix/sys/contrib/dev/acpica/events/evglock.c - copied unchanged from r221044, head/sys/contrib/dev/acpica/events/evglock.c projects/altix/sys/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu - copied unchanged from r221044, head/sys/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu projects/altix/sys/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu - copied unchanged from r221044, head/sys/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu projects/altix/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu - copied unchanged from r221044, head/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu projects/altix/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu - copied unchanged from r221044, head/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu projects/altix/sys/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu - copied unchanged from r221044, head/sys/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c - copied unchanged from r221044, head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h - copied unchanged from r221044, head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c - copied unchanged from r221044, head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h - copied unchanged from r221044, head/sys/dev/ath/ath_hal/ar9002/ar9285_phy.h projects/altix/sys/geom/eli/g_eli_key_cache.c - copied unchanged from r221044, head/sys/geom/eli/g_eli_key_cache.c projects/altix/sys/geom/geom_map.c - copied unchanged from r221044, head/sys/geom/geom_map.c projects/altix/sys/modules/iwnfw/iwn6000g2a/ - copied from r221044, head/sys/modules/iwnfw/iwn6000g2a/ projects/altix/sys/modules/iwnfw/iwn6000g2b/ - copied from r221044, head/sys/modules/iwnfw/iwn6000g2b/ projects/altix/sys/net80211/ieee80211_alq.c - copied unchanged from r221044, head/sys/net80211/ieee80211_alq.c projects/altix/sys/net80211/ieee80211_alq.h - copied unchanged from r221044, head/sys/net80211/ieee80211_alq.h projects/altix/sys/nfs/bootp_subr.c - copied unchanged from r221044, head/sys/nfs/bootp_subr.c projects/altix/sys/nfs/krpc.h - copied unchanged from r221044, head/sys/nfs/krpc.h projects/altix/sys/nfs/krpc_subr.c - copied unchanged from r221044, head/sys/nfs/krpc_subr.c projects/altix/sys/nfs/nfs_diskless.c - copied unchanged from r221044, head/sys/nfs/nfs_diskless.c projects/altix/sys/nfs/nfsdiskless.h - copied unchanged from r221044, head/sys/nfs/nfsdiskless.h Deleted: projects/altix/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu projects/altix/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu projects/altix/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu projects/altix/sys/fs/nfsclient/nfsargs.h projects/altix/sys/fs/nfsclient/nfsdiskless.h projects/altix/sys/nfsclient/bootp_subr.c projects/altix/sys/nfsclient/krpc.h projects/altix/sys/nfsclient/krpc_subr.c projects/altix/sys/nfsclient/nfs_diskless.c projects/altix/sys/nfsclient/nfsdiskless.h Modified: projects/altix/sys/amd64/amd64/genassym.c projects/altix/sys/amd64/amd64/identcpu.c projects/altix/sys/amd64/amd64/machdep.c projects/altix/sys/amd64/amd64/pmap.c projects/altix/sys/amd64/conf/GENERIC projects/altix/sys/amd64/include/clock.h projects/altix/sys/amd64/include/cpufunc.h projects/altix/sys/amd64/include/pmap.h projects/altix/sys/amd64/include/specialreg.h projects/altix/sys/arm/at91/at91_wdt.c projects/altix/sys/arm/conf/AVILA projects/altix/sys/arm/conf/CAMBRIA projects/altix/sys/arm/conf/CRB projects/altix/sys/arm/conf/DB-78XXX projects/altix/sys/arm/conf/DB-88F5XXX projects/altix/sys/arm/conf/DB-88F6XXX projects/altix/sys/arm/conf/EP80219 projects/altix/sys/arm/conf/IQ31244 projects/altix/sys/arm/econa/ehci_ebus.c projects/altix/sys/arm/xscale/i8134x/crb_machdep.c projects/altix/sys/boot/forth/loader.conf projects/altix/sys/boot/i386/gptzfsboot/Makefile projects/altix/sys/boot/i386/zfsboot/Makefile projects/altix/sys/boot/pc98/boot2/boot2.c projects/altix/sys/cam/ata/ata_all.c projects/altix/sys/cam/ata/ata_all.h projects/altix/sys/cam/ata/ata_da.c projects/altix/sys/cam/ata/ata_pmp.c projects/altix/sys/cam/ata/ata_xpt.c projects/altix/sys/cam/cam_ccb.h projects/altix/sys/cam/cam_periph.c projects/altix/sys/cam/cam_xpt.c projects/altix/sys/cam/scsi/scsi_cd.c projects/altix/sys/cam/scsi/scsi_ch.c projects/altix/sys/cam/scsi/scsi_da.c projects/altix/sys/cam/scsi/scsi_pass.c projects/altix/sys/cam/scsi/scsi_pt.c projects/altix/sys/cam/scsi/scsi_sa.c projects/altix/sys/cam/scsi/scsi_sg.c projects/altix/sys/compat/freebsd32/freebsd32_misc.c projects/altix/sys/compat/freebsd32/freebsd32_proto.h projects/altix/sys/compat/freebsd32/freebsd32_syscall.h projects/altix/sys/compat/freebsd32/freebsd32_syscalls.c projects/altix/sys/compat/freebsd32/freebsd32_sysent.c projects/altix/sys/compat/freebsd32/freebsd32_systrace_args.c projects/altix/sys/compat/freebsd32/syscalls.master projects/altix/sys/conf/NOTES projects/altix/sys/conf/files projects/altix/sys/conf/files.amd64 projects/altix/sys/conf/files.arm projects/altix/sys/conf/files.i386 projects/altix/sys/conf/files.ia64 projects/altix/sys/conf/files.mips projects/altix/sys/conf/files.pc98 projects/altix/sys/conf/files.powerpc projects/altix/sys/conf/files.sparc64 projects/altix/sys/conf/files.sun4v projects/altix/sys/conf/kern.mk projects/altix/sys/conf/kern.pre.mk projects/altix/sys/conf/kmod.mk projects/altix/sys/conf/options projects/altix/sys/contrib/dev/acpica/acpica_prep.sh projects/altix/sys/contrib/dev/acpica/changes.txt projects/altix/sys/contrib/dev/acpica/common/dmtable.c projects/altix/sys/contrib/dev/acpica/common/dmtbdump.c projects/altix/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/altix/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/altix/sys/contrib/dev/acpica/compiler/aslcompiler.y projects/altix/sys/contrib/dev/acpica/compiler/asldefine.h projects/altix/sys/contrib/dev/acpica/compiler/aslglobal.h projects/altix/sys/contrib/dev/acpica/compiler/asllookup.c projects/altix/sys/contrib/dev/acpica/compiler/aslmain.c projects/altix/sys/contrib/dev/acpica/compiler/aslmap.c projects/altix/sys/contrib/dev/acpica/compiler/aslmessages.h projects/altix/sys/contrib/dev/acpica/compiler/aslpredef.c projects/altix/sys/contrib/dev/acpica/compiler/asltypes.h projects/altix/sys/contrib/dev/acpica/compiler/aslutils.c projects/altix/sys/contrib/dev/acpica/compiler/aslwalks.c projects/altix/sys/contrib/dev/acpica/compiler/dtcompile.c projects/altix/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/altix/sys/contrib/dev/acpica/compiler/dtexpress.c projects/altix/sys/contrib/dev/acpica/compiler/dtfield.c projects/altix/sys/contrib/dev/acpica/compiler/dtio.c projects/altix/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/altix/sys/contrib/dev/acpica/compiler/dttable.c projects/altix/sys/contrib/dev/acpica/compiler/dttemplate.c projects/altix/sys/contrib/dev/acpica/compiler/dttemplate.h projects/altix/sys/contrib/dev/acpica/compiler/dtutils.c projects/altix/sys/contrib/dev/acpica/debugger/dbdisply.c projects/altix/sys/contrib/dev/acpica/dispatcher/dswload.c projects/altix/sys/contrib/dev/acpica/dispatcher/dswload2.c projects/altix/sys/contrib/dev/acpica/events/evmisc.c projects/altix/sys/contrib/dev/acpica/events/evregion.c projects/altix/sys/contrib/dev/acpica/events/evrgnini.c projects/altix/sys/contrib/dev/acpica/events/evxfregn.c projects/altix/sys/contrib/dev/acpica/executer/excreate.c projects/altix/sys/contrib/dev/acpica/include/acconfig.h projects/altix/sys/contrib/dev/acpica/include/acevents.h projects/altix/sys/contrib/dev/acpica/include/acpixf.h projects/altix/sys/contrib/dev/acpica/include/actypes.h projects/altix/sys/contrib/dev/acpica/include/amlcode.h projects/altix/sys/contrib/dev/acpica/namespace/nsrepair.c projects/altix/sys/contrib/dev/acpica/utilities/utdecode.c projects/altix/sys/dev/acpica/acpi.c projects/altix/sys/dev/acpica/acpi_thermal.c projects/altix/sys/dev/acpica/acpi_timer.c projects/altix/sys/dev/ahci/ahci.c projects/altix/sys/dev/ahci/ahci.h projects/altix/sys/dev/aic7xxx/aicasm/Makefile projects/altix/sys/dev/ata/ata-all.c projects/altix/sys/dev/ata/ata-all.h projects/altix/sys/dev/ata/ata-lowlevel.c projects/altix/sys/dev/ata/ata-pci.h projects/altix/sys/dev/ata/chipsets/ata-intel.c projects/altix/sys/dev/ath/ath_hal/ah.c projects/altix/sys/dev/ath/ath_hal/ah.h projects/altix/sys/dev/ath/ath_hal/ah_debug.h projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v14.h projects/altix/sys/dev/ath/ath_hal/ah_eeprom_v4k.h projects/altix/sys/dev/ath/ath_hal/ah_internal.h projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/altix/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9002phy.h projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285.h projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/altix/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c projects/altix/sys/dev/ath/if_ath.c projects/altix/sys/dev/ath/if_ath_sysctl.c projects/altix/sys/dev/ath/if_athioctl.h projects/altix/sys/dev/ath/if_athvar.h projects/altix/sys/dev/bxe/bxe_debug.h projects/altix/sys/dev/bxe/bxe_include.h projects/altix/sys/dev/bxe/if_bxe.c projects/altix/sys/dev/bxe/if_bxe.h projects/altix/sys/dev/cas/if_cas.c projects/altix/sys/dev/cxgbe/adapter.h projects/altix/sys/dev/cxgbe/common/t4_hw.c projects/altix/sys/dev/cxgbe/osdep.h projects/altix/sys/dev/cxgbe/t4_main.c projects/altix/sys/dev/cxgbe/t4_sge.c projects/altix/sys/dev/drm/drm_sysctl.c projects/altix/sys/dev/esp/ncr53c9x.c projects/altix/sys/dev/gem/if_gem.c projects/altix/sys/dev/hme/if_hme.c projects/altix/sys/dev/hme/if_hmereg.h projects/altix/sys/dev/ichwd/ichwd.c projects/altix/sys/dev/ichwd/ichwd.h projects/altix/sys/dev/ipmi/ipmi.c projects/altix/sys/dev/iwn/if_iwn.c projects/altix/sys/dev/iwn/if_iwnreg.h projects/altix/sys/dev/iwn/if_iwnvar.h projects/altix/sys/dev/ixgbe/ixgbe.c projects/altix/sys/dev/ixgbe/ixgbe.h projects/altix/sys/dev/mii/brgphyreg.h projects/altix/sys/dev/mii/ciphyreg.h projects/altix/sys/dev/mii/e1000phy.c projects/altix/sys/dev/mii/e1000phyreg.h projects/altix/sys/dev/mii/mii_physubr.c projects/altix/sys/dev/mii/miivar.h projects/altix/sys/dev/mii/rgephyreg.h projects/altix/sys/dev/mii/xmphyreg.h projects/altix/sys/dev/mpt/mpt.c projects/altix/sys/dev/mpt/mpt.h projects/altix/sys/dev/mpt/mpt_cam.c projects/altix/sys/dev/mpt/mpt_debug.c projects/altix/sys/dev/mpt/mpt_pci.c projects/altix/sys/dev/msk/if_msk.c projects/altix/sys/dev/mvs/mvs.c projects/altix/sys/dev/mvs/mvs.h projects/altix/sys/dev/siis/siis.c projects/altix/sys/dev/siis/siis.h projects/altix/sys/dev/sound/usb/uaudio.c projects/altix/sys/dev/sym/README.sym projects/altix/sys/dev/sym/sym_fw1.h projects/altix/sys/dev/sym/sym_fw2.h projects/altix/sys/dev/sym/sym_hipd.c projects/altix/sys/dev/usb/controller/ehci_ixp4xx.c projects/altix/sys/dev/usb/controller/ehci_mv.c projects/altix/sys/dev/usb/controller/ehci_pci.c projects/altix/sys/fs/nfs/nfs.h projects/altix/sys/fs/nfs/nfs_commonacl.c projects/altix/sys/fs/nfs/nfs_commonkrpc.c projects/altix/sys/fs/nfs/nfs_commonport.c projects/altix/sys/fs/nfs/nfs_commonsubs.c projects/altix/sys/fs/nfs/nfs_var.h projects/altix/sys/fs/nfs/nfsport.h projects/altix/sys/fs/nfsclient/nfs.h projects/altix/sys/fs/nfsclient/nfs_clbio.c projects/altix/sys/fs/nfsclient/nfs_clnfsiod.c projects/altix/sys/fs/nfsclient/nfs_clnode.c projects/altix/sys/fs/nfsclient/nfs_clport.c projects/altix/sys/fs/nfsclient/nfs_clrpcops.c projects/altix/sys/fs/nfsclient/nfs_clstate.c projects/altix/sys/fs/nfsclient/nfs_clsubs.c projects/altix/sys/fs/nfsclient/nfs_clvfsops.c projects/altix/sys/fs/nfsclient/nfs_clvnops.c projects/altix/sys/fs/nfsclient/nfsnode.h projects/altix/sys/fs/nfsserver/nfs_nfsdport.c projects/altix/sys/fs/nfsserver/nfs_nfsdserv.c projects/altix/sys/geom/eli/g_eli.c projects/altix/sys/geom/eli/g_eli.h projects/altix/sys/geom/eli/g_eli_ctl.c projects/altix/sys/geom/eli/g_eli_integrity.c projects/altix/sys/geom/eli/g_eli_key.c projects/altix/sys/geom/eli/g_eli_privacy.c projects/altix/sys/geom/part/g_part_apm.c projects/altix/sys/geom/raid/g_raid.c projects/altix/sys/i386/bios/apm.c projects/altix/sys/i386/conf/GENERIC projects/altix/sys/i386/conf/XBOX projects/altix/sys/i386/i386/genassym.c projects/altix/sys/i386/i386/identcpu.c projects/altix/sys/i386/i386/machdep.c projects/altix/sys/i386/i386/pmap.c projects/altix/sys/i386/include/clock.h projects/altix/sys/i386/include/cpufunc.h projects/altix/sys/i386/include/pmap.h projects/altix/sys/i386/include/specialreg.h projects/altix/sys/ia64/conf/GENERIC projects/altix/sys/ia64/include/pmap.h projects/altix/sys/kern/init_sysent.c projects/altix/sys/kern/kern_exit.c projects/altix/sys/kern/kern_hhook.c projects/altix/sys/kern/kern_khelp.c projects/altix/sys/kern/kern_sig.c projects/altix/sys/kern/link_elf.c projects/altix/sys/kern/link_elf_obj.c projects/altix/sys/kern/subr_rman.c projects/altix/sys/kern/syscalls.c projects/altix/sys/kern/syscalls.master projects/altix/sys/kern/systrace_args.c projects/altix/sys/kern/uipc_sockbuf.c projects/altix/sys/kern/vfs_default.c projects/altix/sys/kern/vfs_mount.c projects/altix/sys/kern/vfs_subr.c projects/altix/sys/kern/vfs_syscalls.c projects/altix/sys/kern/vnode_if.src projects/altix/sys/mips/atheros/ar71xx_ehci.c projects/altix/sys/mips/conf/MALTA projects/altix/sys/mips/conf/MALTA64 projects/altix/sys/mips/conf/OCTEON1 projects/altix/sys/mips/conf/std.SWARM projects/altix/sys/mips/malta/std.malta projects/altix/sys/mips/rmi/xls_ehci.c projects/altix/sys/modules/Makefile projects/altix/sys/modules/acpi/acpi/Makefile projects/altix/sys/modules/ath/Makefile projects/altix/sys/modules/bxe/Makefile projects/altix/sys/modules/cam/Makefile projects/altix/sys/modules/geom/geom_eli/Makefile projects/altix/sys/modules/iwnfw/Makefile projects/altix/sys/modules/iwnfw/iwn1000/Makefile projects/altix/sys/modules/iwnfw/iwn5000/Makefile projects/altix/sys/modules/iwnfw/iwn6050/Makefile projects/altix/sys/modules/netgraph/atm/ccatm/Makefile projects/altix/sys/modules/nfscl/Makefile projects/altix/sys/modules/nfsclient/Makefile projects/altix/sys/net80211/ieee80211_output.c projects/altix/sys/netgraph/atm/ccatm/ng_ccatm.c projects/altix/sys/netgraph/atm/sscfu/ng_sscfu.c projects/altix/sys/netgraph/atm/sscop/ng_sscop.c projects/altix/sys/netgraph/atm/uni/ng_uni.c projects/altix/sys/netgraph/bluetooth/hci/ng_hci_main.c projects/altix/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c projects/altix/sys/netgraph/netflow/netflow.c projects/altix/sys/netgraph/netflow/ng_netflow.c projects/altix/sys/netgraph/netflow/ng_netflow.h projects/altix/sys/netgraph/ng_UI.c projects/altix/sys/netgraph/ng_async.c projects/altix/sys/netgraph/ng_atmllc.c projects/altix/sys/netgraph/ng_base.c projects/altix/sys/netgraph/ng_bridge.c projects/altix/sys/netgraph/ng_car.c projects/altix/sys/netgraph/ng_cisco.c projects/altix/sys/netgraph/ng_device.c projects/altix/sys/netgraph/ng_eiface.c projects/altix/sys/netgraph/ng_etf.c projects/altix/sys/netgraph/ng_fec.c projects/altix/sys/netgraph/ng_frame_relay.c projects/altix/sys/netgraph/ng_gif_demux.c projects/altix/sys/netgraph/ng_hub.c projects/altix/sys/netgraph/ng_iface.c projects/altix/sys/netgraph/ng_ksocket.c projects/altix/sys/netgraph/ng_l2tp.c projects/altix/sys/netgraph/ng_lmi.c projects/altix/sys/netgraph/ng_mppc.c projects/altix/sys/netgraph/ng_nat.c projects/altix/sys/netgraph/ng_one2many.c projects/altix/sys/netgraph/ng_patch.c projects/altix/sys/netgraph/ng_pipe.c projects/altix/sys/netgraph/ng_ppp.c projects/altix/sys/netgraph/ng_pppoe.c projects/altix/sys/netgraph/ng_pptpgre.c projects/altix/sys/netgraph/ng_rfc1490.c projects/altix/sys/netgraph/ng_sample.c projects/altix/sys/netgraph/ng_source.c projects/altix/sys/netgraph/ng_split.c projects/altix/sys/netgraph/ng_sppp.c projects/altix/sys/netgraph/ng_tee.c projects/altix/sys/netgraph/ng_tty.c projects/altix/sys/netgraph/ng_vjc.c projects/altix/sys/netgraph/ng_vlan.c projects/altix/sys/netinet/cc.h projects/altix/sys/netinet/cc/cc.c projects/altix/sys/netinet/cc/cc_chd.c projects/altix/sys/netinet/cc/cc_cubic.c projects/altix/sys/netinet/cc/cc_cubic.h projects/altix/sys/netinet/cc/cc_hd.c projects/altix/sys/netinet/cc/cc_htcp.c projects/altix/sys/netinet/cc/cc_module.h projects/altix/sys/netinet/cc/cc_newreno.c projects/altix/sys/netinet/cc/cc_vegas.c projects/altix/sys/netinet/in_pcb.c projects/altix/sys/netinet/in_pcb.h projects/altix/sys/netinet/in_proto.c projects/altix/sys/netinet/ip_fw.h projects/altix/sys/netinet/ip_input.c projects/altix/sys/netinet/ip_output.c projects/altix/sys/netinet/ip_var.h projects/altix/sys/netinet/ipfw/ip_dn_io.c projects/altix/sys/netinet/ipfw/ip_dummynet.c projects/altix/sys/netinet/ipfw/ip_fw2.c projects/altix/sys/netinet/ipfw/ip_fw_nat.c projects/altix/sys/netinet/ipfw/ip_fw_private.h projects/altix/sys/netinet/khelp/h_ertt.c projects/altix/sys/netinet/khelp/h_ertt.h projects/altix/sys/netinet/libalias/alias_db.c projects/altix/sys/netinet/raw_ip.c projects/altix/sys/netinet/siftr.c projects/altix/sys/netinet/tcp_input.c projects/altix/sys/netinet/tcp_output.c projects/altix/sys/netinet/tcp_subr.c projects/altix/sys/netinet/tcp_syncache.c projects/altix/sys/netinet/tcp_var.h projects/altix/sys/netinet/udp_usrreq.c projects/altix/sys/netinet6/in6.h projects/altix/sys/netinet6/in6_proto.c projects/altix/sys/netinet6/nd6_nbr.c projects/altix/sys/nfsclient/nfs_subs.c projects/altix/sys/nfsclient/nfs_vfsops.c projects/altix/sys/nfsclient/nfsargs.h projects/altix/sys/pc98/conf/GENERIC projects/altix/sys/pc98/pc98/machdep.c projects/altix/sys/powerpc/aim/machdep.c projects/altix/sys/powerpc/aim/mmu_oea.c projects/altix/sys/powerpc/aim/mmu_oea64.c projects/altix/sys/powerpc/conf/GENERIC projects/altix/sys/powerpc/conf/GENERIC64 projects/altix/sys/powerpc/conf/MPC85XX projects/altix/sys/powerpc/powerpc/exec_machdep.c projects/altix/sys/powerpc/powerpc/mp_machdep.c projects/altix/sys/rpc/clnt_dg.c projects/altix/sys/rpc/clnt_vc.c projects/altix/sys/sparc64/conf/GENERIC projects/altix/sys/sparc64/include/cpufunc.h projects/altix/sys/sparc64/sbus/lsi64854.c projects/altix/sys/sparc64/sbus/ofw_sbus.h projects/altix/sys/sparc64/sparc64/exception.S projects/altix/sys/sparc64/sparc64/iommu.c projects/altix/sys/sparc64/sparc64/machdep.c projects/altix/sys/sparc64/sparc64/pmap.c projects/altix/sys/sun4v/conf/GENERIC projects/altix/sys/sun4v/include/cddl/mdesc_impl.h projects/altix/sys/sun4v/include/cpufunc.h projects/altix/sys/sun4v/sun4v/tte_hash.c projects/altix/sys/sys/ata.h projects/altix/sys/sys/eventhandler.h projects/altix/sys/sys/fcntl.h projects/altix/sys/sys/hhook.h projects/altix/sys/sys/khelp.h projects/altix/sys/sys/module_khelp.h projects/altix/sys/sys/param.h projects/altix/sys/sys/proc.h projects/altix/sys/sys/socket.h projects/altix/sys/sys/syscall.h projects/altix/sys/sys/syscall.mk projects/altix/sys/sys/sysproto.h projects/altix/sys/sys/systm.h projects/altix/sys/sys/vnode.h projects/altix/sys/ufs/ffs/ffs_alloc.c projects/altix/sys/ufs/ufs/ufs_extern.h projects/altix/sys/ufs/ufs/ufs_inode.c projects/altix/sys/vm/vm_object.c projects/altix/sys/x86/isa/clock.c projects/altix/sys/x86/x86/tsc.c Directory Properties: projects/altix/lib/libstand/ (props changed) projects/altix/sys/ (props changed) projects/altix/sys/amd64/include/xen/ (props changed) projects/altix/sys/boot/i386/efi/ (props changed) projects/altix/sys/boot/ia64/efi/ (props changed) projects/altix/sys/boot/ia64/ski/ (props changed) projects/altix/sys/boot/powerpc/boot1.chrp/ (props changed) projects/altix/sys/boot/powerpc/ofw/ (props changed) projects/altix/sys/cddl/contrib/opensolaris/ (props changed) projects/altix/sys/conf/ (props changed) projects/altix/sys/contrib/dev/acpica/ (props changed) projects/altix/sys/contrib/octeon-sdk/ (props changed) projects/altix/sys/contrib/pf/ (props changed) projects/altix/sys/contrib/x86emu/ (props changed) projects/altix/sys/kern/subr_busdma.c (props changed) Modified: projects/altix/sys/amd64/amd64/genassym.c ============================================================================== --- projects/altix/sys/amd64/amd64/genassym.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/amd64/genassym.c Tue Apr 26 00:20:04 2011 (r221045) @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #include <nfs/nfsproto.h> #include <nfsclient/nfs.h> -#include <nfsclient/nfsdiskless.h> +#include <nfs/nfsdiskless.h> #include <x86/apicreg.h> #include <machine/cpu.h> #include <machine/pcb.h> Modified: projects/altix/sys/amd64/amd64/identcpu.c ============================================================================== --- projects/altix/sys/amd64/amd64/identcpu.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/amd64/identcpu.c Tue Apr 26 00:20:04 2011 (r221045) @@ -396,8 +396,11 @@ printcpuinfo(void) * If this CPU supports P-state invariant TSC then * mention the capability. */ - if (tsc_is_invariant) + if (tsc_is_invariant) { printf("\n TSC: P-state invariant"); + if (tsc_perf_stat) + printf(", performance statistics"); + } } } Modified: projects/altix/sys/amd64/amd64/machdep.c ============================================================================== --- projects/altix/sys/amd64/amd64/machdep.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/amd64/machdep.c Tue Apr 26 00:20:04 2011 (r221045) @@ -545,23 +545,20 @@ cpu_flush_dcache(void *ptr, size_t len) int cpu_est_clockrate(int cpu_id, uint64_t *rate) { + uint64_t tsc1, tsc2; + uint64_t acnt, mcnt, perf; register_t reg; - uint64_t freq, tsc1, tsc2; if (pcpu_find(cpu_id) == NULL || rate == NULL) return (EINVAL); - freq = atomic_load_acq_64(&tsc_freq); - /* If TSC is P-state invariant, DELAY(9) based logic fails. */ - if (tsc_is_invariant && freq != 0) + /* + * If TSC is P-state invariant and APERF/MPERF MSRs do not exist, + * DELAY(9) based logic fails. + */ + if (tsc_is_invariant && !tsc_perf_stat) return (EOPNOTSUPP); - /* If we're booting, trust the rate calibrated moments ago. */ - if (cold && freq != 0) { - *rate = freq; - return (0); - } - #ifdef SMP if (smp_cpus > 1) { /* Schedule ourselves on the indicated cpu. */ @@ -573,10 +570,24 @@ cpu_est_clockrate(int cpu_id, uint64_t * /* Calibrate by measuring a short delay. */ reg = intr_disable(); - tsc1 = rdtsc(); - DELAY(1000); - tsc2 = rdtsc(); - intr_restore(reg); + if (tsc_is_invariant) { + wrmsr(MSR_MPERF, 0); + wrmsr(MSR_APERF, 0); + tsc1 = rdtsc(); + DELAY(1000); + mcnt = rdmsr(MSR_MPERF); + acnt = rdmsr(MSR_APERF); + tsc2 = rdtsc(); + intr_restore(reg); + perf = 1000 * acnt / mcnt; + *rate = (tsc2 - tsc1) * perf; + } else { + tsc1 = rdtsc(); + DELAY(1000); + tsc2 = rdtsc(); + intr_restore(reg); + *rate = (tsc2 - tsc1) * 1000; + } #ifdef SMP if (smp_cpus > 1) { @@ -586,17 +597,6 @@ cpu_est_clockrate(int cpu_id, uint64_t * } #endif - tsc2 -= tsc1; - if (freq != 0) { - *rate = tsc2 * 1000; - return (0); - } - - /* - * Subtract 0.5% of the total. Empirical testing has shown that - * overhead in DELAY() works out to approximately this value. - */ - *rate = tsc2 * 1000 - tsc2 * 5; return (0); } Modified: projects/altix/sys/amd64/amd64/pmap.c ============================================================================== --- projects/altix/sys/amd64/amd64/pmap.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/amd64/pmap.c Tue Apr 26 00:20:04 2011 (r221045) @@ -239,7 +239,6 @@ static vm_page_t pmap_enter_quick_locked vm_page_t m, vm_prot_t prot, vm_page_t mpte); static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); -static void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); static boolean_t pmap_is_referenced_pvh(struct md_page *pvh); static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); @@ -1105,7 +1104,9 @@ pmap_update_pde(pmap_t pmap, vm_offset_t } #endif /* !SMP */ -static void +#define PMAP_CLFLUSH_THRESHOLD (2 * 1024 * 1024) + +void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva) { @@ -1117,7 +1118,7 @@ pmap_invalidate_cache_range(vm_offset_t if (cpu_feature & CPUID_SS) ; /* If "Self Snoop" is supported, do nothing. */ else if ((cpu_feature & CPUID_CLFSH) != 0 && - eva - sva < 2 * 1024 * 1024) { + eva - sva < PMAP_CLFLUSH_THRESHOLD) { /* * Otherwise, do per-cache line flush. Use the mfence @@ -1142,6 +1143,34 @@ pmap_invalidate_cache_range(vm_offset_t } /* + * Remove the specified set of pages from the data and instruction caches. + * + * In contrast to pmap_invalidate_cache_range(), this function does not + * rely on the CPU's self-snoop feature, because it is intended for use + * when moving pages into a different cache domain. + */ +void +pmap_invalidate_cache_pages(vm_page_t *pages, int count) +{ + vm_offset_t daddr, eva; + int i; + + if (count >= PMAP_CLFLUSH_THRESHOLD / PAGE_SIZE || + (cpu_feature & CPUID_CLFSH) == 0) + pmap_invalidate_cache(); + else { + mfence(); + for (i = 0; i < count; i++) { + daddr = PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pages[i])); + eva = daddr + PAGE_SIZE; + for (; daddr < eva; daddr += cpu_clflush_line_size) + clflush(daddr); + } + mfence(); + } +} + +/* * Are we current address space or kernel? */ static __inline int Modified: projects/altix/sys/amd64/conf/GENERIC ============================================================================== --- projects/altix/sys/amd64/conf/GENERIC Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/conf/GENERIC Tue Apr 26 00:20:04 2011 (r221045) @@ -89,14 +89,12 @@ device pci # Floppy drives device fdc -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +# ATA controllers +device ahci # AHCI-compatible SATA controllers +device ata # Legacy ATA/SATA controllers +options ATA_CAM # Handle legacy controllers with CAM +device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA +device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices @@ -120,13 +118,13 @@ device adw # Advansys wide SCSI adapte device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters -# SCSI peripherals -device scbus # SCSI bus (required for SCSI) +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) device ch # SCSI media changers device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) device ses # SCSI Environmental Services (and SAF-TE) # RAID controllers interfaced to the SCSI subsystem Modified: projects/altix/sys/amd64/include/clock.h ============================================================================== --- projects/altix/sys/amd64/include/clock.h Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/include/clock.h Tue Apr 26 00:20:04 2011 (r221045) @@ -19,6 +19,7 @@ extern u_int i8254_freq; extern int i8254_max_count; extern uint64_t tsc_freq; extern int tsc_is_invariant; +extern int tsc_perf_stat; void i8254_init(void); Modified: projects/altix/sys/amd64/include/cpufunc.h ============================================================================== --- projects/altix/sys/amd64/include/cpufunc.h Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/include/cpufunc.h Tue Apr 26 00:20:04 2011 (r221045) @@ -45,15 +45,15 @@ struct region_descriptor; -#define readb(va) (*(volatile u_int8_t *) (va)) -#define readw(va) (*(volatile u_int16_t *) (va)) -#define readl(va) (*(volatile u_int32_t *) (va)) -#define readq(va) (*(volatile u_int64_t *) (va)) - -#define writeb(va, d) (*(volatile u_int8_t *) (va) = (d)) -#define writew(va, d) (*(volatile u_int16_t *) (va) = (d)) -#define writel(va, d) (*(volatile u_int32_t *) (va) = (d)) -#define writeq(va, d) (*(volatile u_int64_t *) (va) = (d)) +#define readb(va) (*(volatile uint8_t *) (va)) +#define readw(va) (*(volatile uint16_t *) (va)) +#define readl(va) (*(volatile uint32_t *) (va)) +#define readq(va) (*(volatile uint64_t *) (va)) + +#define writeb(va, d) (*(volatile uint8_t *) (va) = (d)) +#define writew(va, d) (*(volatile uint16_t *) (va) = (d)) +#define writel(va, d) (*(volatile uint32_t *) (va) = (d)) +#define writeq(va, d) (*(volatile uint64_t *) (va) = (d)) #if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE) @@ -176,7 +176,7 @@ inb(u_int port) { u_char data; - __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -185,7 +185,7 @@ inl(u_int port) { u_int data; - __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -227,20 +227,20 @@ inw(u_int port) { u_short data; - __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void outb(u_int port, u_char data) { - __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -270,7 +270,7 @@ outsl(u_int port, const void *addr, size static __inline void outw(u_int port, u_short data) { - __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -295,31 +295,40 @@ read_rflags(void) return (rf); } -static __inline u_int64_t +static __inline uint64_t rdmsr(u_int msr) { - u_int32_t low, high; + uint32_t low, high; __asm __volatile("rdmsr" : "=a" (low), "=d" (high) : "c" (msr)); - return (low | ((u_int64_t)high << 32)); + return (low | ((uint64_t)high << 32)); } -static __inline u_int64_t +static __inline uint64_t rdpmc(u_int pmc) { - u_int32_t low, high; + uint32_t low, high; __asm __volatile("rdpmc" : "=a" (low), "=d" (high) : "c" (pmc)); - return (low | ((u_int64_t)high << 32)); + return (low | ((uint64_t)high << 32)); } -static __inline u_int64_t +static __inline uint64_t rdtsc(void) { - u_int32_t low, high; + uint32_t low, high; __asm __volatile("rdtsc" : "=a" (low), "=d" (high)); - return (low | ((u_int64_t)high << 32)); + return (low | ((uint64_t)high << 32)); +} + +static __inline uint32_t +rdtsc32(void) +{ + uint32_t rv; + + __asm __volatile("rdtsc" : "=a" (rv) : : "edx"); + return (rv); } static __inline void @@ -335,9 +344,9 @@ write_rflags(u_long rf) } static __inline void -wrmsr(u_int msr, u_int64_t newval) +wrmsr(u_int msr, uint64_t newval) { - u_int32_t low, high; + uint32_t low, high; low = newval; high = newval >> 32; @@ -530,114 +539,114 @@ ltr(u_short sel) __asm __volatile("ltr %0" : : "r" (sel)); } -static __inline u_int64_t +static __inline uint64_t rdr0(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr0,%0" : "=r" (data)); return (data); } static __inline void -load_dr0(u_int64_t dr0) +load_dr0(uint64_t dr0) { __asm __volatile("movq %0,%%dr0" : : "r" (dr0)); } -static __inline u_int64_t +static __inline uint64_t rdr1(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr1,%0" : "=r" (data)); return (data); } static __inline void -load_dr1(u_int64_t dr1) +load_dr1(uint64_t dr1) { __asm __volatile("movq %0,%%dr1" : : "r" (dr1)); } -static __inline u_int64_t +static __inline uint64_t rdr2(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr2,%0" : "=r" (data)); return (data); } static __inline void -load_dr2(u_int64_t dr2) +load_dr2(uint64_t dr2) { __asm __volatile("movq %0,%%dr2" : : "r" (dr2)); } -static __inline u_int64_t +static __inline uint64_t rdr3(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr3,%0" : "=r" (data)); return (data); } static __inline void -load_dr3(u_int64_t dr3) +load_dr3(uint64_t dr3) { __asm __volatile("movq %0,%%dr3" : : "r" (dr3)); } -static __inline u_int64_t +static __inline uint64_t rdr4(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr4,%0" : "=r" (data)); return (data); } static __inline void -load_dr4(u_int64_t dr4) +load_dr4(uint64_t dr4) { __asm __volatile("movq %0,%%dr4" : : "r" (dr4)); } -static __inline u_int64_t +static __inline uint64_t rdr5(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr5,%0" : "=r" (data)); return (data); } static __inline void -load_dr5(u_int64_t dr5) +load_dr5(uint64_t dr5) { __asm __volatile("movq %0,%%dr5" : : "r" (dr5)); } -static __inline u_int64_t +static __inline uint64_t rdr6(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr6,%0" : "=r" (data)); return (data); } static __inline void -load_dr6(u_int64_t dr6) +load_dr6(uint64_t dr6) { __asm __volatile("movq %0,%%dr6" : : "r" (dr6)); } -static __inline u_int64_t +static __inline uint64_t rdr7(void) { - u_int64_t data; + uint64_t data; __asm __volatile("movq %%dr7,%0" : "=r" (data)); return (data); } static __inline void -load_dr7(u_int64_t dr7) +load_dr7(uint64_t dr7) { __asm __volatile("movq %0,%%dr7" : : "r" (dr7)); } @@ -684,14 +693,14 @@ void lldt(u_short sel); void load_cr0(u_long cr0); void load_cr3(u_long cr3); void load_cr4(u_long cr4); -void load_dr0(u_int64_t dr0); -void load_dr1(u_int64_t dr1); -void load_dr2(u_int64_t dr2); -void load_dr3(u_int64_t dr3); -void load_dr4(u_int64_t dr4); -void load_dr5(u_int64_t dr5); -void load_dr6(u_int64_t dr6); -void load_dr7(u_int64_t dr7); +void load_dr0(uint64_t dr0); +void load_dr1(uint64_t dr1); +void load_dr2(uint64_t dr2); +void load_dr3(uint64_t dr3); +void load_dr4(uint64_t dr4); +void load_dr5(uint64_t dr5); +void load_dr6(uint64_t dr6); +void load_dr7(uint64_t dr7); void load_fs(u_short sel); void load_gs(u_short sel); void ltr(u_short sel); @@ -705,23 +714,23 @@ u_long rcr0(void); u_long rcr2(void); u_long rcr3(void); u_long rcr4(void); -u_int64_t rdmsr(u_int msr); -u_int64_t rdpmc(u_int pmc); -u_int64_t rdr0(void); -u_int64_t rdr1(void); -u_int64_t rdr2(void); -u_int64_t rdr3(void); -u_int64_t rdr4(void); -u_int64_t rdr5(void); -u_int64_t rdr6(void); -u_int64_t rdr7(void); -u_int64_t rdtsc(void); +uint64_t rdmsr(u_int msr); +uint64_t rdpmc(u_int pmc); +uint64_t rdr0(void); +uint64_t rdr1(void); +uint64_t rdr2(void); +uint64_t rdr3(void); +uint64_t rdr4(void); +uint64_t rdr5(void); +uint64_t rdr6(void); +uint64_t rdr7(void); +uint64_t rdtsc(void); u_int read_rflags(void); u_int rfs(void); u_int rgs(void); void wbinvd(void); void write_rflags(u_int rf); -void wrmsr(u_int msr, u_int64_t newval); +void wrmsr(u_int msr, uint64_t newval); #endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ Modified: projects/altix/sys/amd64/include/pmap.h ============================================================================== --- projects/altix/sys/amd64/include/pmap.h Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/include/pmap.h Tue Apr 26 00:20:04 2011 (r221045) @@ -328,6 +328,8 @@ void pmap_invalidate_page(pmap_t, vm_off void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); void pmap_invalidate_all(pmap_t); void pmap_invalidate_cache(void); +void pmap_invalidate_cache_pages(vm_page_t *pages, int count); +void pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva); #endif /* _KERNEL */ Modified: projects/altix/sys/amd64/include/specialreg.h ============================================================================== --- projects/altix/sys/amd64/include/specialreg.h Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/amd64/include/specialreg.h Tue Apr 26 00:20:04 2011 (r221045) @@ -196,6 +196,12 @@ #define CPUID_HTT_CORES 0x00ff0000 #define CPUID_LOCAL_APIC_ID 0xff000000 +/* + * CPUID instruction 6 ecx info + */ +#define CPUID_PERF_STAT 0x00000001 +#define CPUID_PERF_BIAS 0x00000008 + /* * CPUID instruction 0xb ebx info. */ Modified: projects/altix/sys/arm/at91/at91_wdt.c ============================================================================== --- projects/altix/sys/arm/at91/at91_wdt.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/at91/at91_wdt.c Tue Apr 26 00:20:04 2011 (r221045) @@ -102,7 +102,7 @@ wdt_watchdog(void *argp, u_int cmd, int else if (interval > 0) sc->cmd = interval | WD_ACTIVE; - /* We cannot turn of our watchdog so if user + /* We cannot turn off our watchdog so if user * fails to turn us on go to passive mode. */ if ((sc->cmd & WD_ACTIVE) == 0) sc->cmd = WD_PASSIVE; Modified: projects/altix/sys/arm/conf/AVILA ============================================================================== --- projects/altix/sys/arm/conf/AVILA Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/AVILA Tue Apr 26 00:20:04 2011 (r221045) @@ -92,8 +92,8 @@ device gpioled device avila_gpio # GPIO pins on J8 device ata -device atadisk # ATA disk drives device avila_ata # Gateworks CF/IDE support +options ATA_CAM device npe # Network Processing Engine device npe_fw @@ -149,8 +149,9 @@ device usb device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) +device pass # Passthrough device (direct ATA/SCSI access) #device ural #device zyd Modified: projects/altix/sys/arm/conf/CAMBRIA ============================================================================== --- projects/altix/sys/arm/conf/CAMBRIA Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/CAMBRIA Tue Apr 26 00:20:04 2011 (r221045) @@ -95,8 +95,8 @@ device gpioled device cambria_gpio # GPIO pins on J11 device ata -device atadisk # ATA disk drives device avila_ata # Gateworks CF/IDE support +options ATA_CAM device npe # Network Processing Engine device npe_fw @@ -154,8 +154,9 @@ options USB_EHCI_BIG_ENDIAN_DESC # hand #options USB_DEBUG device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) +device pass # Passthrough device (direct ATA/SCSI access) #device ural #device zyd Modified: projects/altix/sys/arm/conf/CRB ============================================================================== --- projects/altix/sys/arm/conf/CRB Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/CRB Tue Apr 26 00:20:04 2011 (r221045) @@ -73,12 +73,12 @@ device uart device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +options ATA_CAM + +device scbus # SCSI bus (required for ATA/SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct ATA/SCSI access) device "7seg" Modified: projects/altix/sys/arm/conf/DB-78XXX ============================================================================== --- projects/altix/sys/arm/conf/DB-78XXX Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/DB-78XXX Tue Apr 26 00:20:04 2011 (r221045) @@ -81,8 +81,7 @@ device iicbus device ds133x # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT Modified: projects/altix/sys/arm/conf/DB-88F5XXX ============================================================================== --- projects/altix/sys/arm/conf/DB-88F5XXX Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/DB-88F5XXX Tue Apr 26 00:20:04 2011 (r221045) @@ -83,8 +83,7 @@ device pass device da # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT Modified: projects/altix/sys/arm/conf/DB-88F6XXX ============================================================================== --- projects/altix/sys/arm/conf/DB-88F6XXX Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/DB-88F6XXX Tue Apr 26 00:20:04 2011 (r221045) @@ -80,8 +80,7 @@ device iic device iicbus # SATA -device ata -device atadisk +device mvs # Flattened Device Tree options FDT Modified: projects/altix/sys/arm/conf/EP80219 ============================================================================== --- projects/altix/sys/arm/conf/EP80219 Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/EP80219 Tue Apr 26 00:20:04 2011 (r221045) @@ -73,12 +73,12 @@ device uart device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +options ATA_CAM + +device scbus # SCSI bus (required for ATA/SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct ATA/SCSI access) # SCSI Controllers @@ -111,4 +111,4 @@ options INCLUDE_CONFIG_FILE # Inclu options VERBOSE_INIT_ARM device bpf -#options ROOTDEVNAME=\"ufs:ad4s1a\" +#options ROOTDEVNAME=\"ufs:ada0s1a\" Modified: projects/altix/sys/arm/conf/IQ31244 ============================================================================== --- projects/altix/sys/arm/conf/IQ31244 Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/conf/IQ31244 Tue Apr 26 00:20:04 2011 (r221045) @@ -72,12 +72,12 @@ device uart device pci device ata -device atadisk # ATA disk drives -device ataraid # ATA RAID drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering +options ATA_CAM + +device scbus # SCSI bus (required for ATA/SCSI) +device cd # CD +device da # Direct Access (disks) +device pass # Passthrough device (direct ATA/SCSI access) # SCSI Controllers Copied: projects/altix/sys/arm/conf/TS7800 (from r221044, head/sys/arm/conf/TS7800) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/altix/sys/arm/conf/TS7800 Tue Apr 26 00:20:04 2011 (r221045, copy of r221044, head/sys/arm/conf/TS7800) @@ -0,0 +1,80 @@ +# +# Custom kernel for the TS-7800 board. +# +# $FreeBSD$ +# + +ident TS7800 +include "../mv/orion/std.ts7800" + +options SOC_MV_ORION +makeoptions MODULES_OVERRIDE="" + +#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions WERROR="-Werror" + +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options INET6 #IPv6 communications protocols +options FFS #Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options NFSCLIENT #Network Filesystem Client +options NFSLOCKD #Network Lock Manager +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=mge0 + +options SYSVSHM #SYSV-style shared memory +options SYSVMSG #SYSV-style message queues +options SYSVSEM #SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options MUTEX_NOINLINE +options RWLOCK_NOINLINE +options NO_FFS_SNAPSHOT +options NO_SWAPPING + +# Debugging +options ALT_BREAK_TO_DEBUGGER +options DDB +options KDB +options GDB # Support remote GDB. + +device mvs +device pci + +# Pseudo devices +device md +device loop +device pty +device random + +# Serial ports +device uart + +# Networking +device ether +device mge # Marvell Gigabit Ethernet controller +device mii +device e1000phy +device bpf +options HZ=1000 + +# USB +device usb +device ehci +device umass +device scbus +device pass +device da + +# SATA +device ata +options ATA_CAM + +# Flattened Device Tree +options FDT +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=ts7800.dts + Modified: projects/altix/sys/arm/econa/ehci_ebus.c ============================================================================== --- projects/altix/sys/arm/econa/ehci_ebus.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/econa/ehci_ebus.c Tue Apr 26 00:20:04 2011 (r221045) @@ -238,10 +238,10 @@ ehci_ebus_detach(device_t self) device_delete_all_children(self); /* - * disable interrupts that might have been switched on in ehci_init + * disable interrupts that might have been switched on in + * ehci_ebus_attach() */ if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Copied: projects/altix/sys/arm/mv/orion/files.ts7800 (from r221044, head/sys/arm/mv/orion/files.ts7800) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/altix/sys/arm/mv/orion/files.ts7800 Tue Apr 26 00:20:04 2011 (r221045, copy of r221044, head/sys/arm/mv/orion/files.ts7800) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +arm/mv/orion/orion.c standard + Copied: projects/altix/sys/arm/mv/orion/std.ts7800 (from r221044, head/sys/arm/mv/orion/std.ts7800) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/altix/sys/arm/mv/orion/std.ts7800 Tue Apr 26 00:20:04 2011 (r221045, copy of r221044, head/sys/arm/mv/orion/std.ts7800) @@ -0,0 +1,15 @@ +# $FreeBSD$ + +include "../mv/std.mv" +files "../mv/orion/files.ts7800" + +makeoptions KERNPHYSADDR=0x00900000 +makeoptions KERNVIRTADDR=0xc0900000 + +options KERNPHYSADDR=0x00900000 +options KERNVIRTADDR=0xc0900000 +options PHYSADDR=0x00000000 +options STARTUP_PAGETABLE_ADDR=0x00100000 +options LOADERRAMADDR=0x00000000 +options FLASHADDR=0x00008000 + Modified: projects/altix/sys/arm/xscale/i8134x/crb_machdep.c ============================================================================== --- projects/altix/sys/arm/xscale/i8134x/crb_machdep.c Tue Apr 26 00:08:50 2011 (r221044) +++ projects/altix/sys/arm/xscale/i8134x/crb_machdep.c Tue Apr 26 00:20:04 2011 (r221045) @@ -196,6 +196,9 @@ initarm(void *arg, void *arg2) pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); + /* Do basic tuning, hz etc */ + init_param1(); + freemempos = 0x00200000; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -389,8 +392,6 @@ initarm(void *arg, void *arg2) phys_avail[i++] = 0; phys_avail[i] = 0; - /* Do basic tuning, hz etc */ - init_param1(); init_param2(physmem); kdb_init(); return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - Copied: projects/altix/sys/boot/fdt/dts/ts7800.dts (from r221044, head/sys/boot/fdt/dts/ts7800.dts) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/altix/sys/boot/fdt/dts/ts7800.dts Tue Apr 26 00:20:04 2011 (r221045, copy of r221044, head/sys/boot/fdt/dts/ts7800.dts) @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2010 The FreeBSD Foundation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Technologic Systems TS-7800 Device Tree Source. + * + * $FreeBSD$ + */ + +/dts-v1/; + +/ { + model = "mrvl,TS-7800"; + compatible = "DB-88F5182-BP", "DB-88F5182-BP-A"; + #address-cells = <1>; + #size-cells = <1>; + + aliases { + ethernet0 = &mge0; + serial0 = &serial0; + serial1 = &serial1; + mpp = &MPP; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "ARM,88FR531"; + reg = <0x0>; + d-cache-line-size = <32>; // 32 bytes + i-cache-line-size = <32>; // 32 bytes + d-cache-size = <0x8000>; // L1, 32K + i-cache-size = <0x8000>; // L1, 32K + timebase-frequency = <0>; + bus-frequency = <0>; + clock-frequency = <0>; + }; + }; + + memory { + device_type = "memory"; + reg = <0x0 0x08000000>; // 128M at 0x0 + }; + + localbus@f1000000 { + #address-cells = <2>; + #size-cells = <1>; + compatible = "mrvl,lbc"; + + /* This reflects CPU decode windows setup. */ + ranges = <0x0 0x0f 0xf9300000 0x00100000 + 0x1 0x1e 0xfa000000 0x00100000 + 0x2 0x1d 0xfa100000 0x02000000>; + }; + + soc88f5182@f1000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges = <0x0 0xf1000000 0x00100000>; + bus-frequency = <0>; + + PIC: pic@20200 { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + reg = <0x20200 0x3c>; + compatible = "mrvl,pic"; + }; + + timer@20300 { + compatible = "mrvl,timer"; + reg = <0x20300 0x30>; + interrupts = <0>; + interrupt-parent = <&PIC>; + mrvl,has-wdt; + }; + + MPP: mpp@10000 { + #pin-cells = <2>; + compatible = "mrvl,mpp"; + reg = <0x10000 0x54>; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104260020.p3Q0K4bM098805>