Date: Sun, 20 Oct 2013 20:52:23 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 1162565 for review Message-ID: <201310202052.r9KKqNYn034227@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@1162565?ac=10 Change 1162565 by jhb@jhb_pippin on 2013/10/20 20:52:06 IFC @1162516 Affected files ... .. //depot/projects/smpng/share/man/man9/rtentry.9#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#133 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#109 integrate .. //depot/projects/smpng/sys/amd64/include/vmm.h#5 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#7 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_controls.h#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/x86.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep-v6.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#30 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv7.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#13 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#25 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#27 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#46 integrate .. //depot/projects/smpng/sys/arm/arm/pl310.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/pmap-v6.c#9 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#4 integrate .. //depot/projects/smpng/sys/arm/include/armreg.h#18 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#44 integrate .. //depot/projects/smpng/sys/arm/mv/common.c#17 integrate .. //depot/projects/smpng/sys/arm/mv/mv_localbus.c#3 integrate .. //depot/projects/smpng/sys/arm/mv/mvreg.h#14 integrate .. //depot/projects/smpng/sys/arm/versatile/versatile_pci.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#18 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#37 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/crb_machdep.c#16 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#22 integrate .. //depot/projects/smpng/sys/arm/xscale/pxa/pxa_machdep.c#11 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#80 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#14 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.c#12 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.h#9 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#25 integrate .. //depot/projects/smpng/sys/cam/ata/ata_pmp.c#13 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#56 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#16 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#90 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_periph.h#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#47 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#31 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#59 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#32 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#113 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_enc.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#36 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#24 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#47 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 integrate .. //depot/projects/smpng/sys/conf/NOTES#206 integrate .. //depot/projects/smpng/sys/conf/files#291 integrate .. //depot/projects/smpng/sys/conf/files.amd64#99 integrate .. //depot/projects/smpng/sys/conf/files.i386#157 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#81 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#91 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#41 integrate .. //depot/projects/smpng/sys/conf/options#204 integrate .. //depot/projects/smpng/sys/contrib/dev/run/rt2870.fw.uu#4 integrate .. //depot/projects/smpng/sys/contrib/rdma/core_priv.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_addr.h#4 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_cache.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_cm.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_fmr_pool.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_mad.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_marshall.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_pack.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_sa.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_smi.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_umem.h#4 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_user_cm.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_user_mad.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_user_sa.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_user_verbs.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/ib_verbs.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/iw_cm.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/krping/getopt.c#3 integrate .. //depot/projects/smpng/sys/contrib/rdma/krping/krping.c#6 integrate .. //depot/projects/smpng/sys/contrib/rdma/krping/krping.h#5 integrate .. //depot/projects/smpng/sys/contrib/rdma/krping/krping_dev.c#5 integrate .. //depot/projects/smpng/sys/contrib/rdma/rdma_addr.c#7 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_cache.c#4 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_cm.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_cm_ib.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_cma.c#11 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_device.c#4 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_iwcm.c#4 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_user_cm.h#3 delete .. //depot/projects/smpng/sys/contrib/rdma/rdma_verbs.c#3 delete .. //depot/projects/smpng/sys/contrib/rdma/types.h#3 delete .. //depot/projects/smpng/sys/dev/altera/atse/a_api.h#1 branch .. //depot/projects/smpng/sys/dev/altera/atse/if_atse.c#1 branch .. //depot/projects/smpng/sys/dev/altera/atse/if_atse_fdt.c#1 branch .. //depot/projects/smpng/sys/dev/altera/atse/if_atse_nexus.c#1 branch .. //depot/projects/smpng/sys/dev/altera/atse/if_atsereg.h#1 branch .. //depot/projects/smpng/sys/dev/altera/sdcard/altera_sdcard.c#3 integrate .. //depot/projects/smpng/sys/dev/altera/sdcard/altera_sdcard_io.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#119 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#37 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#109 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_tx.c#14 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.c#2 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_stats.c#2 integrate .. //depot/projects/smpng/sys/dev/bxe/ecore_sp.h#2 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#15 integrate .. //depot/projects/smpng/sys/dev/cxgbe/adapter.h#13 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/common.h#10 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw_cfg.txt#6 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt#5 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw_interface.h#8 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw_cfg.txt#2 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt#2 integrate .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/cm.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/cq.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/device.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/ev.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/id_table.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/mem.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/provider.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/qp.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/resource.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/t4.h#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/user.h#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#18 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_sge.c#15 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_cpl_io.c#9 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch.c#7 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_9340.c#1 branch .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_9340.h#1 branch .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_vlans.c#2 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitchreg.h#4 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitchvar.h#5 integrate .. //depot/projects/smpng/sys/dev/fdt/fdtbus.c#11 integrate .. //depot/projects/smpng/sys/dev/glxsb/glxsb.c#6 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#34 integrate .. //depot/projects/smpng/sys/dev/hyperv/include/hyperv.h#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_net_vsc.h#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/storvsc/hv_vstorage.h#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/vmbus/hv_channel.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/vmbus/hv_hv.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hyperv/vmbus/hv_vmbus_priv.h#2 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#75 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#81 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#57 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#50 integrate .. //depot/projects/smpng/sys/dev/random/dummy_rng.c#1 branch .. //depot/projects/smpng/sys/dev/random/harvest.c#15 integrate .. //depot/projects/smpng/sys/dev/random/hash.h#7 integrate .. //depot/projects/smpng/sys/dev/random/ivy.c#5 integrate .. //depot/projects/smpng/sys/dev/random/live_entropy_sources.c#1 branch .. //depot/projects/smpng/sys/dev/random/live_entropy_sources.h#1 branch .. //depot/projects/smpng/sys/dev/random/nehemiah.c#11 integrate .. //depot/projects/smpng/sys/dev/random/pseudo_rng.c#2 delete .. //depot/projects/smpng/sys/dev/random/random_adaptors.c#4 integrate .. //depot/projects/smpng/sys/dev/random/random_adaptors.h#3 integrate .. //depot/projects/smpng/sys/dev/random/random_harvestq.c#2 integrate .. //depot/projects/smpng/sys/dev/random/random_harvestq.h#2 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#36 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.h#10 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#22 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.h#6 integrate .. //depot/projects/smpng/sys/dev/random/rwfile.c#1 branch .. //depot/projects/smpng/sys/dev/random/rwfile.h#1 branch .. //depot/projects/smpng/sys/dev/random/yarrow.c#18 integrate .. //depot/projects/smpng/sys/dev/random/yarrow.h#6 integrate .. //depot/projects/smpng/sys/dev/rndtest/rndtest.c#10 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#21 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#20 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#90 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#184 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_runreg.h#6 integrate .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmx.c#2 integrate .. //depot/projects/smpng/sys/dev/vmware/vmxnet3/if_vmxvar.h#3 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#21 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#103 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#65 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#73 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#62 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#43 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#26 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#46 integrate .. //depot/projects/smpng/sys/geom/part/g_part_apm.c#16 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#23 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#19 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#28 integrate .. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#22 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#19 integrate .. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#14 integrate .. //depot/projects/smpng/sys/geom/raid/g_raid.c#9 integrate .. //depot/projects/smpng/sys/geom/raid/g_raid.h#6 integrate .. //depot/projects/smpng/sys/geom/raid/tr_concat.c#4 integrate .. //depot/projects/smpng/sys/geom/raid/tr_raid0.c#4 integrate .. //depot/projects/smpng/sys/geom/raid/tr_raid1.c#6 integrate .. //depot/projects/smpng/sys/geom/raid/tr_raid1e.c#7 integrate .. //depot/projects/smpng/sys/geom/raid/tr_raid5.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#138 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#149 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#42 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#39 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#107 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#57 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#77 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#151 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_chip.c#9 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_cpudef.h#9 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_machdep.c#10 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_spi.c#4 integrate .. //depot/projects/smpng/sys/mips/atheros/ar724x_chip.c#9 integrate .. //depot/projects/smpng/sys/mips/atheros/ar91xx_chip.c#9 integrate .. //depot/projects/smpng/sys/mips/atheros/ar933x_chip.c#4 integrate .. //depot/projects/smpng/sys/mips/atheros/ar933xreg.h#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar934x_chip.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar934xreg.h#3 integrate .. //depot/projects/smpng/sys/mips/atheros/if_arge.c#14 integrate .. //depot/projects/smpng/sys/mips/atheros/if_argevar.h#7 integrate .. //depot/projects/smpng/sys/mips/beri/beri_machdep.c#4 integrate .. //depot/projects/smpng/sys/mips/beri/files.beri#3 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_rnd.c#4 integrate .. //depot/projects/smpng/sys/mips/conf/DB120#2 integrate .. //depot/projects/smpng/sys/mips/conf/DB120.hints#2 integrate .. //depot/projects/smpng/sys/mips/include/asm.h#11 integrate .. //depot/projects/smpng/sys/mips/include/pcb.h#9 integrate .. //depot/projects/smpng/sys/mips/mips/bcopy.S#2 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#15 integrate .. //depot/projects/smpng/sys/mips/mips/fp.S#6 integrate .. //depot/projects/smpng/sys/mips/mips/support.S#12 integrate .. //depot/projects/smpng/sys/mips/mips/swtch.S#12 integrate .. //depot/projects/smpng/sys/modules/Makefile#200 integrate .. //depot/projects/smpng/sys/modules/cxgb/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/cxgbe/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/cxgbe/iw_cxgbe/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cxgbe/t4_firmware/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/cxgbe/t5_firmware/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/dtrace/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/dtrace/fasttrap/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/random/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/rdma/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/rdma/addr/Makefile#3 delete .. //depot/projects/smpng/sys/modules/rdma/cma/Makefile#3 delete .. //depot/projects/smpng/sys/modules/rdma/core/Makefile#3 delete .. //depot/projects/smpng/sys/modules/rdma/iwcm/Makefile#3 delete .. //depot/projects/smpng/sys/net/flowtable.c#23 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#18 integrate .. //depot/projects/smpng/sys/net/if.c#153 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#123 integrate .. //depot/projects/smpng/sys/net/if_tun.c#82 integrate .. //depot/projects/smpng/sys/net/if_var.h#88 integrate .. //depot/projects/smpng/sys/net/radix.c#21 integrate .. //depot/projects/smpng/sys/net/radix.h#16 integrate .. //depot/projects/smpng/sys/net/route.c#68 integrate .. //depot/projects/smpng/sys/net/rtsock.c#94 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#36 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#80 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#50 integrate .. //depot/projects/smpng/sys/netinet/in.c#85 integrate .. //depot/projects/smpng/sys/netinet/in.h#60 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#38 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#130 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#133 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#37 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#51 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#89 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#32 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#88 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#87 integrate .. //depot/projects/smpng/sys/netipx/ipx.c#20 integrate .. //depot/projects/smpng/sys/netipx/ipx_if.h#12 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/en_netdev.c#6 integrate .. //depot/projects/smpng/sys/ofed/include/linux/gfp.h#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/clock.c#12 delete .. //depot/projects/smpng/sys/powerpc/aim/interrupt.c#8 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#37 integrate .. //depot/projects/smpng/sys/powerpc/aim/nexus.c#13 delete .. //depot/projects/smpng/sys/powerpc/aim/trap.c#24 integrate .. //depot/projects/smpng/sys/powerpc/aim/vm_machdep.c#17 delete .. //depot/projects/smpng/sys/powerpc/booke/clock.c#12 delete .. //depot/projects/smpng/sys/powerpc/booke/vm_machdep.c#13 delete .. //depot/projects/smpng/sys/powerpc/conf/GENERIC64#18 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/nexus.c#8 delete .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#20 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#21 branch .. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#14 branch .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#49 branch .. //depot/projects/smpng/sys/powerpc/pseries/phyp-hvcall.S#2 integrate .. //depot/projects/smpng/sys/powerpc/pseries/phyp_llan.c#1 branch .. //depot/projects/smpng/sys/sys/_task.h#12 integrate .. //depot/projects/smpng/sys/sys/counter.h#3 integrate .. //depot/projects/smpng/sys/sys/devicestat.h#10 integrate .. //depot/projects/smpng/sys/sys/param.h#186 integrate .. //depot/projects/smpng/sys/sys/random.h#7 integrate .. //depot/projects/smpng/sys/sys/systm.h#114 integrate .. //depot/projects/smpng/sys/sys/taskqueue.h#25 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#35 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#100 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#15 integrate .. //depot/projects/smpng/sys/vm/vm_phys.c#21 integrate .. //depot/projects/smpng/sys/xen/xen-os.h#2 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/rtentry.9#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/rtentry.9 206622 2010-04-14 19:08:06Z uqs $ +.\" $FreeBSD: head/share/man/man9/rtentry.9 256618 2013-10-16 10:36:42Z melifaro $ .\" -.Dd December 11, 2008 +.Dd October 16, 2013 .Dt RTENTRY 9 .Os .Sh NAME @@ -154,8 +154,7 @@ .It Dv RTF_PRCLONING This flag is obsolete and simply ignored by facility. .It Dv RTF_PINNED -(Reserved for future use to indicate routes which are not to be -modified by a routing protocol.) +Indicates that this route is immutable to a routing protocol. .It Dv RTF_LOCAL Indicates that the destination of this route is an address configured as belonging to this system. ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#133 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 256166 2013-10-08 20:04:35Z dim $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 256645 2013-10-16 18:20:27Z neel $"); /* * Manages physical address maps. @@ -371,6 +371,8 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled, 0, "Is TLB Context ID enabled ?"); int invpcid_works = 0; +SYSCTL_INT(_vm_pmap, OID_AUTO, invpcid_works, CTLFLAG_RD, &invpcid_works, 0, + "Is the invpcid instruction available ?"); static int pmap_pcid_save_cnt_proc(SYSCTL_HANDLER_ARGS) ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#109 (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: head/sys/amd64/conf/GENERIC 255752 2013-09-21 01:07:27Z gjb $ +# $FreeBSD: head/sys/amd64/conf/GENERIC 256328 2013-10-11 19:40:28Z gjb $ cpu HAMMER ident GENERIC @@ -72,7 +72,6 @@ options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options INCLUDE_CONFIG_FILE # Include this file in kernel -options XENHVM # Include Xen support # Debugging support. Always need this: options KDB # Enable kernel debugger support. @@ -345,8 +344,10 @@ # HyperV drivers device hyperv # HyperV drivers -# Xen support -device xenpci # Generic Xen bus +# Xen HVM Guest Optimizations +# NOTE: XENHVM depends on xenpci. They must be added or removed together. +options XENHVM # Xen HVM kernel infrastructure +device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet ==== //depot/projects/smpng/sys/amd64/include/vmm.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm.h 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/include/vmm.h 256645 2013-10-16 18:20:27Z neel $ */ #ifndef _VMM_H_ @@ -223,6 +223,7 @@ VM_CAP_MTRAP_EXIT, VM_CAP_PAUSE_EXIT, VM_CAP_UNRESTRICTED_GUEST, + VM_CAP_ENABLE_INVPCID, VM_CAP_MAX }; ==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#7 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 256645 2013-10-16 18:20:27Z neel $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 256072 2013-10-05 21:22:35Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 256645 2013-10-16 18:20:27Z neel $"); #include <sys/param.h> #include <sys/systm.h> @@ -164,6 +164,7 @@ static int cap_pause_exit; static int cap_unrestricted_guest; static int cap_monitor_trap; +static int cap_invpcid; static struct unrhdr *vpid_unr; static u_int vpid_alloc_failed; @@ -660,6 +661,11 @@ PROCBASED2_UNRESTRICTED_GUEST, 0, &tmp) == 0); + cap_invpcid = (vmx_set_ctlreg(MSR_VMX_PROCBASED_CTLS2, + MSR_VMX_PROCBASED_CTLS2, PROCBASED2_ENABLE_INVPCID, 0, + &tmp) == 0); + + /* Initialize EPT */ error = ept_init(); if (error) { @@ -828,6 +834,7 @@ vmx->cap[i].set = 0; vmx->cap[i].proc_ctls = procbased_ctls; + vmx->cap[i].proc_ctls2 = procbased_ctls2; vmx->state[i].lastcpu = -1; vmx->state[i].vpid = vpid[i]; @@ -1932,6 +1939,10 @@ if (cap_unrestricted_guest) ret = 0; break; + case VM_CAP_ENABLE_INVPCID: + if (cap_invpcid) + ret = 0; + break; default: break; } @@ -1988,11 +1999,21 @@ case VM_CAP_UNRESTRICTED_GUEST: if (cap_unrestricted_guest) { retval = 0; - baseval = procbased_ctls2; + pptr = &vmx->cap[vcpu].proc_ctls2; + baseval = *pptr; flag = PROCBASED2_UNRESTRICTED_GUEST; reg = VMCS_SEC_PROC_BASED_CTLS; } break; + case VM_CAP_ENABLE_INVPCID: + if (cap_invpcid) { + retval = 0; + pptr = &vmx->cap[vcpu].proc_ctls2; + baseval = *pptr; + flag = PROCBASED2_ENABLE_INVPCID; + reg = VMCS_SEC_PROC_BASED_CTLS; + } + break; default: break; } ==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmx.h 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmx.h 256645 2013-10-16 18:20:27Z neel $ */ #ifndef _VMX_H_ @@ -84,6 +84,7 @@ struct vmxcap { int set; uint32_t proc_ctls; + uint32_t proc_ctls2; }; struct vmxstate { ==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx_controls.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmx_controls.h 245678 2013-01-20 03:42:49Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmx_controls.h 256645 2013-10-16 18:20:27Z neel $ */ #ifndef _VMX_CONTROLS_H_ @@ -68,6 +68,7 @@ #define PROCBASED2_WBINVD_EXITING (1 << 6) #define PROCBASED2_UNRESTRICTED_GUEST (1 << 7) #define PROCBASED2_PAUSE_LOOP_EXITING (1 << 10) +#define PROCBASED2_ENABLE_INVPCID (1 << 12) /* VM Exit Controls */ #define VM_EXIT_SAVE_DEBUG_CONTROLS (1 << 2) ==== //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#6 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 256570 2013-10-16 00:58:47Z neel $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 256072 2013-10-05 21:22:35Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 256570 2013-10-16 00:58:47Z neel $"); #include <sys/param.h> #include <sys/kernel.h> @@ -60,7 +60,10 @@ struct vm *vm; /* vm instance cookie */ struct cdev *cdev; SLIST_ENTRY(vmmdev_softc) link; + int flags; }; +#define VSC_LINKED 0x01 + static SLIST_HEAD(, vmmdev_softc) head; static struct mtx vmmdev_mtx; @@ -104,7 +107,6 @@ static char zerobuf[PAGE_SIZE]; error = 0; - mtx_lock(&vmmdev_mtx); sc = vmmdev_lookup2(cdev); if (sc == NULL) error = ENXIO; @@ -134,8 +136,6 @@ vm_gpa_release(cookie); } } - - mtx_unlock(&vmmdev_mtx); return (error); } @@ -379,34 +379,28 @@ int error; struct vmmdev_softc *sc; - mtx_lock(&vmmdev_mtx); - sc = vmmdev_lookup2(cdev); if (sc != NULL && (nprot & PROT_EXEC) == 0) error = vm_get_memobj(sc->vm, *offset, size, offset, object); else error = EINVAL; - mtx_unlock(&vmmdev_mtx); - return (error); } static void -vmmdev_destroy(struct vmmdev_softc *sc, boolean_t unlink) +vmmdev_destroy(void *arg) { - /* - * XXX must stop virtual machine instances that may be still - * running and cleanup their state. - */ - if (sc->cdev) + struct vmmdev_softc *sc = arg; + + if (sc->cdev != NULL) destroy_dev(sc->cdev); - if (sc->vm) + if (sc->vm != NULL) vm_destroy(sc->vm); - if (unlink) { + if ((sc->flags & VSC_LINKED) != 0) { mtx_lock(&vmmdev_mtx); SLIST_REMOVE(&head, sc, vmmdev_softc, link); mtx_unlock(&vmmdev_mtx); @@ -421,27 +415,38 @@ int error; char buf[VM_MAX_NAMELEN]; struct vmmdev_softc *sc; + struct cdev *cdev; strlcpy(buf, "beavis", sizeof(buf)); error = sysctl_handle_string(oidp, buf, sizeof(buf), req); if (error != 0 || req->newptr == NULL) return (error); - /* - * XXX TODO if any process has this device open then fail - */ - mtx_lock(&vmmdev_mtx); sc = vmmdev_lookup(buf); - if (sc == NULL) { + if (sc == NULL || sc->cdev == NULL) { mtx_unlock(&vmmdev_mtx); return (EINVAL); } - sc->cdev->si_drv1 = NULL; + /* + * The 'cdev' will be destroyed asynchronously when 'si_threadcount' + * goes down to 0 so we should not do it again in the callback. + */ + cdev = sc->cdev; + sc->cdev = NULL; mtx_unlock(&vmmdev_mtx); - vmmdev_destroy(sc, TRUE); + /* + * Schedule the 'cdev' to be destroyed: + * + * - any new operations on this 'cdev' will return an error (ENXIO). + * + * - when the 'si_threadcount' dwindles down to zero the 'cdev' will + * be destroyed and the callback will be invoked in a taskqueue + * context. + */ + destroy_dev_sched_cb(cdev, vmmdev_destroy, sc); return (0); } @@ -462,6 +467,7 @@ { int error; struct vm *vm; + struct cdev *cdev; struct vmmdev_softc *sc, *sc2; char buf[VM_MAX_NAMELEN]; @@ -489,22 +495,28 @@ */ mtx_lock(&vmmdev_mtx); sc2 = vmmdev_lookup(buf); - if (sc2 == NULL) + if (sc2 == NULL) { SLIST_INSERT_HEAD(&head, sc, link); + sc->flags |= VSC_LINKED; + } mtx_unlock(&vmmdev_mtx); if (sc2 != NULL) { - vmmdev_destroy(sc, FALSE); + vmmdev_destroy(sc); return (EEXIST); } - error = make_dev_p(MAKEDEV_CHECKNAME, &sc->cdev, &vmmdevsw, NULL, + error = make_dev_p(MAKEDEV_CHECKNAME, &cdev, &vmmdevsw, NULL, UID_ROOT, GID_WHEEL, 0600, "vmm/%s", buf); if (error != 0) { - vmmdev_destroy(sc, TRUE); + vmmdev_destroy(sc); return (error); } + + mtx_lock(&vmmdev_mtx); + sc->cdev = cdev; sc->cdev->si_drv1 = sc; + mtx_unlock(&vmmdev_mtx); return (0); } ==== //depot/projects/smpng/sys/amd64/vmm/x86.c#7 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/x86.c 255645 2013-09-17 17:56:53Z grehan $ + * $FreeBSD: head/sys/amd64/vmm/x86.c 256645 2013-10-16 18:20:27Z neel $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 255645 2013-09-17 17:56:53Z grehan $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 256645 2013-10-16 18:20:27Z neel $"); #include <sys/param.h> #include <sys/types.h> @@ -53,7 +53,7 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { - int error; + int error, enable_invpcid; unsigned int func, regs[4]; enum x2apic_state x2apic_state; @@ -202,8 +202,22 @@ regs[0] |= 0x04008000; break; + case CPUID_0000_0007: + regs[0] = 0; + regs[1] = 0; + regs[2] = 0; + regs[3] = 0; + + /* leaf 0 */ + if (*ecx == 0) { + error = vm_get_capability(vm, vcpu_id, + VM_CAP_ENABLE_INVPCID, &enable_invpcid); + if (error == 0 && enable_invpcid) + regs[1] |= CPUID_STDEXT_INVPCID; + } + break; + case CPUID_0000_0006: - case CPUID_0000_0007: case CPUID_0000_000A: case CPUID_0000_000D: /* ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep-v6.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 254229 2013-08-11 21:21:02Z cognet $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 256638 2013-10-16 16:35:25Z ian $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -425,14 +425,21 @@ if (_bus_dma_can_bounce(newtag->lowaddr, newtag->highaddr) || newtag->alignment > 1) newtag->flags |= BUS_DMA_COULD_BOUNCE; - else - maxsize = 2; /* Need at most 2 bounce pages for unaligned access on cache line boundaries */ + /* + * Any request can auto-bounce due to cacheline alignment, in addition + * to any alignment or boundary specifications in the tag, so if the + * ALLOCNOW flag is set, there's always work to do. + */ if ((flags & BUS_DMA_ALLOCNOW) != 0) { struct bounce_zone *bz; - - /* Must bounce */ - + /* + * Round size up to a full page, and add one more page because + * there can always be one more boundary crossing than the + * number of pages in a transfer. + */ + maxsize = roundup2(maxsize, PAGE_SIZE) + PAGE_SIZE; + if ((error = alloc_bounce_zone(newtag)) != 0) { free(newtag, M_DEVBUF); return (error); @@ -518,20 +525,22 @@ STAILQ_INIT(&(mapp->bpages)); /* - * Attempt to add pages to our pool on a per-instance - * basis up to a sane limit. + * Attempt to add pages to our pool on a per-instance basis up to a sane + * limit. Even if the tag isn't flagged as COULD_BOUNCE due to + * alignment and boundary constraints, it could still auto-bounce due to + * cacheline alignment, which requires at most two bounce pages. */ if (dmat->flags & BUS_DMA_COULD_BOUNCE) maxpages = MAX_BPAGES; else - maxpages = 2 * bz->map_count; /* Only need at most 2 pages for buffers unaligned on cache line boundaries */ + maxpages = 2 * bz->map_count; if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 || (bz->map_count > 0 && bz->total_bpages < maxpages)) { int pages; - pages = MAX(atop(dmat->maxsize), 1); + pages = atop(roundup2(dmat->maxsize, PAGE_SIZE)) + 1; pages = MIN(maxpages - bz->total_bpages, pages); - pages = MAX(pages, 1); + pages = MAX(pages, 2); if (alloc_bounce_pages(dmat, pages) < pages) return (ENOMEM); @@ -1273,7 +1282,12 @@ } break; + case BUS_DMASYNC_POSTREAD: + case BUS_DMASYNC_POSTWRITE: + case BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE: + break; default: + panic("unsupported combination of sync operations: 0x%08x\n", op); break; } } ==== //depot/projects/smpng/sys/arm/arm/cpufunc.c#30 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc.c 253857 2013-08-01 10:06:19Z ganbold $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc.c 256629 2013-10-16 15:20:27Z br $"); #include <sys/param.h> #include <sys/systm.h> @@ -1476,7 +1476,8 @@ } #endif /* CPU_ARM1136 || CPU_ARM1176 */ #ifdef CPU_CORTEXA - if (cputype == CPU_ID_CORTEXA7 || + if (cputype == CPU_ID_CORTEXA5 || + cputype == CPU_ID_CORTEXA7 || cputype == CPU_ID_CORTEXA8R1 || cputype == CPU_ID_CORTEXA8R2 || cputype == CPU_ID_CORTEXA8R3 || ==== //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv7.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc_asm_armv7.S 248361 2013-03-16 02:48:49Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc_asm_armv7.S 256707 2013-10-17 21:06:19Z cognet $"); .cpu cortex-a8 @@ -57,9 +57,9 @@ #define PT_OUTER_WBWA (1 << 3) #ifdef SMP -#define PT_ATTR (PT_S|PT_INNER_WT|PT_OUTER_WT|PT_NOS) +#define PT_ATTR (PT_S|PT_INNER_WBWA|PT_OUTER_WBWA|PT_NOS) #else -#define PT_ATTR (PT_INNER_WT|PT_OUTER_WT) +#define PT_ATTR (PT_INNER_WBWA|PT_OUTER_WBWA) #endif ENTRY(armv7_setttb) @@ -98,7 +98,7 @@ ldr r1, .Lpage_mask bic r0, r0, r1 #ifdef SMP - mcr p15, 0, r0, c8, c3, 1 /* flush D tlb single entry Inner Shareable*/ + mcr p15, 0, r0, c8, c3, 3 /* flush D tlb single entry Inner Shareable*/ mcr p15, 0, r0, c7, c1, 6 /* flush BTB Inner Shareable */ #else mcr p15, 0, r0, c8, c7, 1 /* flush D tlb single entry */ ==== //depot/projects/smpng/sys/arm/arm/fusu.S#13 (text+ko) ==== @@ -37,7 +37,7 @@ #include <machine/asmacros.h> #include <machine/armreg.h> #include "assym.s" -__FBSDID("$FreeBSD: head/sys/arm/arm/fusu.S 248361 2013-03-16 02:48:49Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/fusu.S 256748 2013-10-18 17:21:47Z cognet $"); #ifdef _ARM_ARCH_6 #define GET_PCB(tmp) \ @@ -67,11 +67,27 @@ stmfd sp!, {r4, r5} adr r4, .Lcasuwordfault str r4, [r3, #PCB_ONFAULT] +#ifdef _ARM_ARCH_6 +1: + cmp r0, #KERNBASE + mvnhs r0, #0 + bhs 2f + + ldrex r5, [r0] + cmp r5, r1 + movne r0, r5 + bne 2f + strex r5, r2, [r0] + cmp r5, #0 + bne 1b +#else ldrt r5, [r0] cmp r5, r1 movne r0, r5 streqt r2, [r0] +#endif moveq r0, r1 +2: ldmfd sp!, {r4, r5} mov r1, #0x00000000 str r1, [r3, #PCB_ONFAULT] ==== //depot/projects/smpng/sys/arm/arm/identcpu.c#25 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/identcpu.c 253857 2013-08-01 10:06:19Z ganbold $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/identcpu.c 256629 2013-10-16 15:20:27Z br $"); #include <sys/systm.h> #include <sys/param.h> #include <sys/malloc.h> @@ -236,6 +236,8 @@ { CPU_ID_ARM1026EJS, CPU_CLASS_ARM10EJ, "ARM1026EJ-S", generic_steppings }, + { CPU_ID_CORTEXA5, CPU_CLASS_CORTEXA, "Cortex A5", + generic_steppings }, { CPU_ID_CORTEXA7, CPU_CLASS_CORTEXA, "Cortex A7", generic_steppings }, { CPU_ID_CORTEXA8R1, CPU_CLASS_CORTEXA, "Cortex A8-r1", ==== //depot/projects/smpng/sys/arm/arm/locore.S#27 (text+ko) ==== @@ -39,7 +39,7 @@ #include <machine/armreg.h> #include <machine/pte.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/locore.S 250928 2013-05-23 12:07:41Z gber $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/locore.S 256628 2013-10-16 14:24:22Z ian $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE (2048 * 4) @@ -187,7 +187,7 @@ mrc p15, 0, r0, c1, c0, 0 #ifdef _ARM_ARCH_6 orr r0, r0, #(CPU_CONTROL_V6_EXTPAGE | CPU_CONTROL_UNAL_ENABLE) - orr r2, r2, #(CPU_CONTROL_AFLT_ENABLE) + orr r0, r0, #(CPU_CONTROL_AFLT_ENABLE) orr r0, r0, #(CPU_CONTROL_AF_ENABLE) #endif orr r0, r0, #(CPU_CONTROL_MMU_ENABLE) ==== //depot/projects/smpng/sys/arm/arm/machdep.c#46 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_timer.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 255091 2013-08-31 07:08:21Z rpaulo $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 256672 2013-10-17 09:57:09Z cognet $"); #include <sys/param.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310202052.r9KKqNYn034227>