Date: Sun, 3 Dec 2006 18:02:35 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 110958 for review Message-ID: <200612031802.kB3I2ZAN060984@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=110958 Change 110958 by rdivacky@rdivacky_witten on 2006/12/03 18:01:58 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/linuxolator/src/sys/arm/include/bus.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/common/copy.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/ia64/common/libia64.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/sparc64/loader/hcall.S#2 delete .. //depot/projects/linuxolator/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#41 integrate .. //depot/projects/linuxolator/src/sys/conf/files#12 integrate .. //depot/projects/linuxolator/src/sys/conf/files.arm#3 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#6 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.mk#2 integrate .. //depot/projects/linuxolator/src/sys/conf/options#8 integrate .. //depot/projects/linuxolator/src/sys/conf/options.arm#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/flash/at45d.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/ad7418.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iicbus/ds1672.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/gentbi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/FILES#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_subr.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/journal/g_journal.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_event.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_resource.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_prf.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/linuxolator/src/sys/modules/Makefile#4 integrate .. //depot/projects/linuxolator/src/sys/modules/wlan_amrr/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/linuxolator/src/sys/net/bridgestp.h#4 integrate .. //depot/projects/linuxolator/src/sys/net/ethernet.h#3 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/linuxolator/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_llc.h#2 integrate .. //depot/projects/linuxolator/src/sys/net/netisr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/route.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_amrr.c#1 branch .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_amrr.h#1 branch .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/linuxolator/src/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcn.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_pcnreg.h#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_diff.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_findname.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_fini.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/cddl/t1_copy.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#7 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/hv_api.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisor_api.h#3 delete .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/tte_hash.h#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_diff.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findname.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_fini.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getbinsize.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getgen.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropdata.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropstr.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropval.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init_intern.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_nodecount.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_rootnode.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_scandag.c#2 delete .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/rtc.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/t1_copy.S#3 delete .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#7 integrate .. //depot/projects/linuxolator/src/sys/sys/pcpu.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/soundcard.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/uio.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_kern.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_meter.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.39 2006/11/11 16:26:55 trhodes Exp $ +# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ .include <bsd.own.mk> @@ -8,8 +8,8 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ - isofs kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ + isa isofs kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.158 2006/11/01 04:54:49 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -185,7 +185,6 @@ ASSYM(PC_FPCURTHREAD, offsetof(struct pcpu, pc_fpcurthread)); ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_SCRATCH_RSP, offsetof(struct pcpu, pc_scratch_rsp)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.663 2006/11/17 20:27:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -833,7 +833,7 @@ static void getmemsize(caddr_t kmdp, u_int64_t first) { - int i, physmap_idx, pa_indx, da_indx; + int i, off, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_tunable; pt_entry_t *pte; @@ -1096,14 +1096,17 @@ /* Trim off space for the message buffer. */ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); - avail_end = phys_avail[pa_indx]; + /* Map the message buffer. */ + for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) + pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + + off); } u_int64_t hammer_time(u_int64_t modulep, u_int64_t physfree) { caddr_t kmdp; - int gsel_tss, off, x; + int gsel_tss, x; struct pcpu *pc; u_int64_t msr; char *env; @@ -1270,10 +1273,6 @@ /* now running on new page tables, configured,and u/iom is accessible */ - /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, avail_end + off); - msgbufinit(msgbufp, MSGBUF_SIZE); fpuinit(); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.573 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $"); /* * Manages physical address maps. @@ -168,8 +168,7 @@ struct pmap kernel_pmap_store; -vm_paddr_t avail_start; /* PA of first available physical page */ -vm_paddr_t avail_end; /* PA of last available physical page */ +static vm_paddr_t avail_start; /* PA of first available physical page */ vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -1613,7 +1612,7 @@ #define PC_FREE1 0xfffffffffffffffful #define PC_FREE2 0x000000fffffffffful -static uint64_t pc_freemask[3] = { PC_FREE0, PC_FREE1, PC_FREE2 }; +static uint64_t pc_freemask[_NPCM] = { PC_FREE0, PC_FREE1, PC_FREE2 }; SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0, "Current number of pv entries"); @@ -2127,7 +2126,8 @@ return; } - if (prot & VM_PROT_WRITE) + if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) == + (VM_PROT_WRITE|VM_PROT_EXECUTE)) return; anychanged = 0; @@ -2163,7 +2163,10 @@ * Check for large page. */ if ((ptpaddr & PG_PS) != 0) { - *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_WRITE) == 0) + *pde &= ~(PG_M|PG_RW); + if ((prot & VM_PROT_EXECUTE) == 0) + *pde |= pg_nx; anychanged = 1; continue; } @@ -2178,6 +2181,8 @@ retry: obits = pbits = *pte; + if ((pbits & PG_V) == 0) + continue; if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { @@ -2193,7 +2198,10 @@ } } - pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_WRITE) == 0) + pbits &= ~(PG_RW | PG_M); + if ((prot & VM_PROT_EXECUTE) == 0) + pbits |= pg_nx; if (pbits != obits) { if (!atomic_cmpset_long(pte, obits, pbits)) ==== //depot/projects/linuxolator/src/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.311 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); /* * AMD64 Trap and System call handling @@ -646,9 +646,10 @@ #endif if (type == T_PAGEFLT) { printf("fault virtual address = 0x%lx\n", eva); - printf("fault code = %s %s, %s\n", + printf("fault code = %s %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", + code & PGEX_I ? "instruction" : "data", code & PGEX_P ? "protection violation" : "page not present"); } printf("instruction pointer = 0x%lx:0x%lx\n", ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#5 (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.468 2006/10/26 22:11:34 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.469 2006/11/22 10:34:12 ru Exp $ cpu HAMMER ident GENERIC @@ -73,7 +73,7 @@ # Linux 32-bit ABI support options COMPAT_LINUX32 # Compatible with i386 linux binaries -options LINPROCFS # Cannot be a module yet. +options LINPROCFS options LINSYSFS # Bus support. ==== //depot/projects/linuxolator/src/sys/amd64/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.136 2006/11/13 20:33:54 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -296,7 +296,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; -extern vm_paddr_t avail_end; extern vm_paddr_t phys_avail[]; extern vm_paddr_t dump_avail[]; extern vm_offset_t virtual_avail; ==== //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); /* * Routines to handle clock hardware. @@ -115,6 +115,7 @@ static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; +static int rtc_reg = -1; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR; @@ -421,24 +422,30 @@ u_char val; RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } val = inb(IO_RTC + 1); - inb(0x84); RTC_UNLOCK; return (val); } -static __inline void -writertc(u_char reg, u_char val) +static void +writertc(int reg, u_char val) { RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); + if (rtc_reg != reg) { + inb(0x84); + outb(IO_RTC, reg); + rtc_reg = reg; + inb(0x84); + } + outb(IO_RTC + 1, val); inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ RTC_UNLOCK; } ==== //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.15 2006/11/30 23:34:07 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1015,7 +1015,6 @@ #ifdef CPU_XSCALE_IXP425 if (cputype == CPU_ID_IXP425_533 || cputype == CPU_ID_IXP425_400 || cputype == CPU_ID_IXP425_266) { - ixp425_icu_init(); cpufuncs = xscale_cpufuncs; #if defined(PERFCTRS) @@ -1886,7 +1885,9 @@ xscale_setup(args) char *args; { +#ifndef CPU_XSCALE_CORE3 uint32_t auxctl; +#endif int cpuctrl, cpuctrlmask; /* @@ -1932,6 +1933,7 @@ /* cpu_control(cpuctrlmask, cpuctrl);*/ cpu_control(0xffffffff, cpuctrl); +#ifndef CPU_XSCALE_CORE3 /* Make sure write coalescing is turned on */ __asm __volatile("mrc p15, 0, %0, c1, c0, 1" : "=r" (auxctl)); @@ -1942,6 +1944,7 @@ #endif __asm __volatile("mcr p15, 0, %0, c1, c0, 1" : : "r" (auxctl)); +#endif } #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ ==== //depot/projects/linuxolator/src/sys/arm/arm/genassym.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.7 2006/11/01 04:54:50 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.8 2006/11/30 04:17:04 jb Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/assym.h> @@ -69,7 +69,6 @@ ASSYM(PCB_PC, offsetof(struct pcb, un_32.pcb32_pc)); ASSYM(PCB_SP, offsetof(struct pcb, un_32.pcb32_sp)); -ASSYM(PC_CONS_BUFR, offsetof(struct pcpu, pc_cons_bufr)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(M_LEN, offsetof(struct mbuf, m_len)); ==== //depot/projects/linuxolator/src/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $"); #include <sys/systm.h> #include <sys/param.h> #include <sys/malloc.h> @@ -141,7 +141,7 @@ }; static const char * const ixp425_steppings[16] = { - "step 0", "rev 1", "rev 2", "rev 3", + "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", "rev 8", "rev 9", "rev 10", "rev 11", "rev 12", "rev 13", "rev 14", "rev 15", ==== //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.7 2006/11/19 23:46:50 sam Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -152,7 +152,7 @@ void -nexus_bs_unmap(void *t, bus_size_t size) +nexus_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { /* * Temporary implementation ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.73 2006/11/12 21:48:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.76 2006/12/01 12:29:55 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -585,7 +585,7 @@ #endif /* ARM_MMU_SA1 == 1*/ #if ARM_MMU_XSCALE == 1 -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined (CPU_XSCALE_CORE3) static u_int xscale_use_minidata; #endif @@ -614,9 +614,11 @@ * is significantly faster than the traditional, write-through * behavior of this case. */ +#ifndef CPU_XSCALE_CORE3 pte_l1_s_cache_mode |= L1_S_XSCALE_TEX(TEX_XSCALE_X); pte_l2_l_cache_mode |= L2_XSCALE_L_TEX(TEX_XSCALE_X); pte_l2_s_cache_mode |= L2_XSCALE_T_TEX(TEX_XSCALE_X); +#endif #endif /* XSCALE_CACHE_READ_WRITE_ALLOCATE */ #ifdef XSCALE_CACHE_WRITE_THROUGH /* @@ -673,8 +675,16 @@ pte_l1_c_proto = L1_C_PROTO_xscale; pte_l2_s_proto = L2_S_PROTO_xscale; +#ifdef CPU_XSCALE_CORE3 + pmap_copy_page_func = pmap_copy_page_generic; + pmap_zero_page_func = pmap_zero_page_generic; + xscale_use_minidata = 0; + pte_l1_s_cache_mode_pt = pte_l2_l_cache_mode_pt = + pte_l2_s_cache_mode_pt = 0; +#else pmap_copy_page_func = pmap_copy_page_xscale; pmap_zero_page_func = pmap_zero_page_xscale; +#endif /* * Disable ECC protection of page table access, for now. @@ -3136,6 +3146,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) return; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { if (flush == FALSE && (pv->pv_pmap == curpm || @@ -3437,7 +3448,8 @@ else if (!pve && !(m->flags & (PG_UNMANAGED | PG_FICTITIOUS))) pve = pmap_get_pv_entry(); - KASSERT(pve != NULL, ("No pv")); + KASSERT(pve != NULL || m->flags & (PG_UNMANAGED | + PG_FICTITIOUS), ("No pv")); oflags = pve->pv_flags; /* @@ -4005,7 +4017,7 @@ * StrongARM accesses to non-cached pages are non-burst making writing * _any_ bulk data very slow. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_CORE3) void pmap_zero_page_generic(vm_paddr_t phys, int off, int size) { @@ -4094,7 +4106,7 @@ pt_entry_t *ptep, *sptep, pte; vm_offset_t next_bucket, eva; -#if (ARM_NMMUS > 1) +#if (ARM_NMMUS > 1) || defined(CPU_XSCALE_CORE3) if (xscale_use_minidata == 0) return; #endif @@ -4267,7 +4279,7 @@ * hook points. The same comment regarding cachability as in * pmap_zero_page also applies here. */ -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined (CPU_XSCALE_CORE3) void pmap_copy_page_generic(vm_paddr_t src, vm_paddr_t dst) { @@ -4430,6 +4442,9 @@ int pmap_ts_referenced(vm_page_t m) { + + if (m->flags & PG_FICTITIOUS) + return (0); return (pmap_clearbit(m, PVF_REF)); } ==== //depot/projects/linuxolator/src/sys/arm/at91/at91.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.8 2006/08/28 20:05:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,7 +68,7 @@ } static void -at91_bs_unmap(void *t, bus_size_t size) +at91_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { vm_offset_t va, endva; @@ -171,7 +171,7 @@ static int at91_probe(device_t dev) { - device_set_desc(dev, "AT91RM9200 device bus"); + device_set_desc(dev, "AT91 device bus"); return (0); } @@ -410,12 +410,12 @@ AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0) panic("Enable to map IRQ registers"); sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; + sc->sc_irq_rman.rm_descr = "AT91 IRQs"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "AT91RM92 Memory"; + sc->sc_mem_rman.rm_descr = "AT91 Memory"; #if 0 sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; - sc->sc_usbmem_rman.rm_descr = "AT91RM92 USB Memory-mapped regs"; + sc->sc_usbmem_rman.rm_descr = "AT91RM9200 USB Memory-mapped regs"; #endif if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_pio.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.3 2006/07/14 22:22:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.4 2006/11/29 08:17:40 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,8 +154,8 @@ AT91_PIO_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT - , GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); + sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT, + GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); if (sc->cdev == NULL) { err = ENOMEM; goto out; ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.3 2006/10/20 07:10:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.4 2006/11/29 07:57:02 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -223,7 +223,7 @@ cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_TNPR, addr); - WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); + WR4(sc, PDC_TNCR, cmd->tx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); mode[i++] = BUS_DMASYNC_POSTWRITE; } @@ -234,12 +234,12 @@ WR4(sc, PDC_RCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); mode[i++] = BUS_DMASYNC_POSTREAD; - if (cmd->tx_data_sz > 0) { + if (cmd->rx_data_sz > 0) { if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_RNPR, addr); - WR4(sc, PDC_RNCR, cmd->tx_data_sz); + WR4(sc, PDC_RNCR, cmd->rx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); mode[i++] = BUS_DMASYNC_POSTREAD; } ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.5 2006/10/20 07:06:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.7 2006/11/29 08:15:59 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,9 +52,7 @@ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ - volatile int flags; -#define RXRDY 4 -#define TXRDY 0x10 + volatile uint32_t flags; uint32_t cwgr; int sc_started; int twi_addr; @@ -131,8 +129,6 @@ WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); -// WR4(sc, TWI_IER, TWI_SR_RXRDY | TWI_SR_OVRE | TWI_SR_UNRE | -// TWI_SR_NACK); if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) device_printf(dev, "could not allocate iicbus instance\n"); @@ -208,17 +204,17 @@ struct at91_twi_softc *sc = xsc; uint32_t status; - /* Reading the status also clears the interrupt */ status = RD4(sc, TWI_SR); - printf("status %x\n", status); if (status == 0) return; - AT91_TWI_LOCK(sc); + sc->flags |= status & (TWI_SR_OVRE | TWI_SR_UNRE | TWI_SR_NACK); if (status & TWI_SR_RXRDY) - sc->flags |= RXRDY; + sc->flags |= TWI_SR_RXRDY; if (status & TWI_SR_TXRDY) - sc->flags |= TXRDY; - AT91_TWI_UNLOCK(sc); + sc->flags |= TWI_SR_TXRDY; + if (status & TWI_SR_TXCOMP) + sc->flags |= TWI_SR_TXCOMP; + WR4(sc, TWI_IDR, status); wakeup(sc); return; } @@ -227,130 +223,17 @@ at91_twi_wait(struct at91_twi_softc *sc, uint32_t bit) { int err = 0; - int counter = 10000; + int counter = 100000; + uint32_t sr; - while (!(RD4(sc, TWI_SR) & bit) && counter-- >= 0) - DELAY(10); + while (!((sr = RD4(sc, TWI_SR)) & bit) && counter-- > 0) + continue; if (counter <= 0) - err = EIO; - return (err); -} - -/* - * Stop the transfer by entering a STOP state on the iic bus. For read - * operations, we've already entered the STOP state, since we need to do - * that to read the last character. For write operations, we need to - * wait for the TXCOMP bit to turn on before returning. - */ -static int -at91_twi_stop(device_t dev) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612031802.kB3I2ZAN060984>