PERFORCE change 231254 for review
John Baldwin
jhb at FreeBSD.org
Thu Jul 18 15:33:41 UTC 2013
http://p4web.freebsd.org/@@231254?ac=10
Change 231254 by jhb at jhb_jhbbsd on 2013/07/18 15:32:45
IFC @231253 (loopback pcib(4) ISA enable commit)
Affected files ...
.. //depot/projects/pci/sys/amd64/amd64/machdep.c#9 integrate
.. //depot/projects/pci/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/pci/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/pci/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/pci/sys/amd64/include/counter.h#2 integrate
.. //depot/projects/pci/sys/amd64/vmm/intel/ept.c#2 integrate
.. //depot/projects/pci/sys/amd64/vmm/vmm_instruction_emul.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/bus_space_generic.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/busdma_machdep-v6.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/pci/sys/arm/arm/db_trace.c#4 integrate
.. //depot/projects/pci/sys/arm/arm/elf_trampoline.c#5 integrate
.. //depot/projects/pci/sys/arm/arm/generic_timer.c#1 branch
.. //depot/projects/pci/sys/arm/arm/gic.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/identcpu.c#4 integrate
.. //depot/projects/pci/sys/arm/arm/pmap-v6.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/trap.c#5 integrate
.. //depot/projects/pci/sys/arm/arm/vfp.c#3 integrate
.. //depot/projects/pci/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_fb.c#2 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_mbox.c#2 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_mbox.h#2 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#3 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/files.bcm2835#3 integrate
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/std.bcm2835#1 branch
.. //depot/projects/pci/sys/arm/broadcom/bcm2835/std.rpi#1 branch
.. //depot/projects/pci/sys/arm/conf/ARNDALE#1 branch
.. //depot/projects/pci/sys/arm/conf/BEAGLEBONE#3 integrate
.. //depot/projects/pci/sys/arm/conf/RPI-B#3 integrate
.. //depot/projects/pci/sys/arm/include/armreg.h#4 integrate
.. //depot/projects/pci/sys/arm/include/counter.h#2 integrate
.. //depot/projects/pci/sys/arm/include/intr.h#3 integrate
.. //depot/projects/pci/sys/arm/samsung/exynos/arch_timer.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/bus_space.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/common.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/ehci_exynos5.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_machdep.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/exynos5_mp.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/files.exynos5#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/std.exynos5#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/uart.c#1 branch
.. //depot/projects/pci/sys/arm/samsung/exynos/uart.h#1 branch
.. //depot/projects/pci/sys/arm/ti/am335x/am335x_pmic.c#2 integrate
.. //depot/projects/pci/sys/arm/ti/am335x/am335x_pwm.c#2 integrate
.. //depot/projects/pci/sys/arm/ti/am335x/am335x_usbss.c#1 branch
.. //depot/projects/pci/sys/arm/ti/am335x/files.am335x#3 integrate
.. //depot/projects/pci/sys/arm/ti/ti_mmchs.c#3 integrate
.. //depot/projects/pci/sys/arm/ti/ti_mmchs.h#2 integrate
.. //depot/projects/pci/sys/arm/versatile/versatile_pci.c#2 integrate
.. //depot/projects/pci/sys/arm/versatile/versatile_sic.c#2 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/am335x-evm.dts#2 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/am335x.dtsi#2 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/bcm2835-rpi-b.dts#3 delete
.. //depot/projects/pci/sys/boot/fdt/dts/bcm2835.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/beaglebone-black.dts#2 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/beaglebone.dts#3 integrate
.. //depot/projects/pci/sys/boot/fdt/dts/exynos5250-arndale.dts#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/exynos5250.dtsi#1 branch
.. //depot/projects/pci/sys/boot/fdt/dts/rpi.dts#1 branch
.. //depot/projects/pci/sys/boot/ficl/loader.c#3 integrate
.. //depot/projects/pci/sys/boot/forth/loader.conf#8 integrate
.. //depot/projects/pci/sys/boot/i386/gptboot/Makefile#5 integrate
.. //depot/projects/pci/sys/boot/i386/gptboot/gptboot.8#1 branch
.. //depot/projects/pci/sys/cam/ata/ata_da.c#9 integrate
.. //depot/projects/pci/sys/cam/cam_ccb.h#7 integrate
.. //depot/projects/pci/sys/cam/cam_periph.c#8 integrate
.. //depot/projects/pci/sys/cam/cam_xpt.c#9 integrate
.. //depot/projects/pci/sys/cam/ctl/ctl_backend_ramdisk.c#4 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_all.c#6 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_all.h#6 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_ch.c#6 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_da.c#7 integrate
.. //depot/projects/pci/sys/cam/scsi/scsi_xpt.c#7 integrate
.. //depot/projects/pci/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#4 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#4 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#6 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#6 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#7 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_ioctl.c#4 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_load.c#3 integrate
.. //depot/projects/pci/sys/cddl/dev/dtrace/dtrace_unload.c#3 integrate
.. //depot/projects/pci/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/pci/sys/compat/linux/linux_ioctl.h#5 integrate
.. //depot/projects/pci/sys/compat/linux/linux_videodev.h#4 delete
.. //depot/projects/pci/sys/compat/linux/linux_videodev2.h#3 delete
.. //depot/projects/pci/sys/conf/Makefile.amd64#5 integrate
.. //depot/projects/pci/sys/conf/Makefile.arm#5 integrate
.. //depot/projects/pci/sys/conf/NOTES#12 integrate
.. //depot/projects/pci/sys/conf/WITHOUT_SOURCELESS_HOST#3 integrate
.. //depot/projects/pci/sys/conf/WITHOUT_SOURCELESS_UCODE#3 integrate
.. //depot/projects/pci/sys/conf/files#13 integrate
.. //depot/projects/pci/sys/conf/files.amd64#8 integrate
.. //depot/projects/pci/sys/conf/files.arm#6 integrate
.. //depot/projects/pci/sys/conf/files.i386#10 integrate
.. //depot/projects/pci/sys/conf/files.ia64#6 integrate
.. //depot/projects/pci/sys/conf/files.mips#9 integrate
.. //depot/projects/pci/sys/conf/files.pc98#5 integrate
.. //depot/projects/pci/sys/conf/files.powerpc#8 integrate
.. //depot/projects/pci/sys/conf/files.sparc64#7 integrate
.. //depot/projects/pci/sys/conf/kmod.mk#8 integrate
.. //depot/projects/pci/sys/conf/newvers.sh#7 integrate
.. //depot/projects/pci/sys/conf/options#13 integrate
.. //depot/projects/pci/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c#2 integrate
.. //depot/projects/pci/sys/contrib/dev/urtwn/LICENSE#1 branch
.. //depot/projects/pci/sys/contrib/dev/urtwn/urtwn-rtl8192cfwT.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/dev/urtwn/urtwn-rtl8192cfwU.fw.uu#1 branch
.. //depot/projects/pci/sys/contrib/v4l/videodev.h#1 branch
.. //depot/projects/pci/sys/contrib/v4l/videodev2.h#1 branch
.. //depot/projects/pci/sys/crypto/sha2/sha2.c#3 integrate
.. //depot/projects/pci/sys/crypto/sha2/sha2.h#3 integrate
.. //depot/projects/pci/sys/crypto/siphash/siphash.c#1 branch
.. //depot/projects/pci/sys/crypto/siphash/siphash.h#1 branch
.. //depot/projects/pci/sys/crypto/siphash/siphash_test.c#1 branch
.. //depot/projects/pci/sys/dev/acpica/acpi_pcib.c#5 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#35 integrate
.. //depot/projects/pci/sys/dev/acpica/acpi_resource.c#10 integrate
.. //depot/projects/pci/sys/dev/ae/if_ae.c#6 integrate
.. //depot/projects/pci/sys/dev/ae/if_aereg.h#3 integrate
.. //depot/projects/pci/sys/dev/ahci/ahci.c#11 integrate
.. //depot/projects/pci/sys/dev/arcmsr/arcmsr.c#6 integrate
.. //depot/projects/pci/sys/dev/arcmsr/arcmsr.h#5 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath_rx_edma.c#3 integrate
.. //depot/projects/pci/sys/dev/bce/if_bce.c#7 integrate
.. //depot/projects/pci/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/pci/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/pci/sys/dev/bge/if_bgereg.h#9 integrate
.. //depot/projects/pci/sys/dev/cpuctl/cpuctl.c#4 integrate
.. //depot/projects/pci/sys/dev/cxgbe/adapter.h#8 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/common.h#7 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4_hw.c#6 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4_hw.h#5 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4_msg.h#4 integrate
.. //depot/projects/pci/sys/dev/cxgbe/common/t4_regs_values.h#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu#1 branch
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu#2 delete
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw_cfg.txt#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t4fw_interface.h#4 integrate
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu#1 branch
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw_cfg.txt#1 branch
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt#1 branch
.. //depot/projects/pci/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt#1 branch
.. //depot/projects/pci/sys/dev/cxgbe/offload.h#6 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_main.c#8 integrate
.. //depot/projects/pci/sys/dev/cxgbe/t4_sge.c#8 integrate
.. //depot/projects/pci/sys/dev/cxgbe/tom/t4_connect.c#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/tom/t4_listen.c#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/tom/t4_tom.c#3 integrate
.. //depot/projects/pci/sys/dev/cxgbe/tom/t4_tom.h#3 integrate
.. //depot/projects/pci/sys/dev/drm2/ttm/ttm_bo_vm.c#2 integrate
.. //depot/projects/pci/sys/dev/e1000/if_em.c#8 integrate
.. //depot/projects/pci/sys/dev/e1000/if_igb.c#12 integrate
.. //depot/projects/pci/sys/dev/e1000/if_lem.c#6 integrate
.. //depot/projects/pci/sys/dev/hme/if_hme.c#5 integrate
.. //depot/projects/pci/sys/dev/hpt27xx/hpt27xx_config.c#3 integrate
.. //depot/projects/pci/sys/dev/hpt27xx/hpt27xx_os_bsd.c#1 branch
.. //depot/projects/pci/sys/dev/hpt27xx/hpt27xx_osm_bsd.c#1 branch
.. //depot/projects/pci/sys/dev/hpt27xx/os_bsd.c#3 delete
.. //depot/projects/pci/sys/dev/hpt27xx/osm_bsd.c#4 delete
.. //depot/projects/pci/sys/dev/hptiop/hptiop.c#6 integrate
.. //depot/projects/pci/sys/dev/hptnr/README#1 branch
.. //depot/projects/pci/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu#1 branch
.. //depot/projects/pci/sys/dev/hptnr/array.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/him.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/himfuncs.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/hptintf.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/hptnr_config.c#1 branch
.. //depot/projects/pci/sys/dev/hptnr/hptnr_config.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/hptnr_os_bsd.c#1 branch
.. //depot/projects/pci/sys/dev/hptnr/hptnr_osm_bsd.c#1 branch
.. //depot/projects/pci/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu#1 branch
.. //depot/projects/pci/sys/dev/hptnr/ldm.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/list.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/os_bsd.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/osm.h#1 branch
.. //depot/projects/pci/sys/dev/hptnr/wj.h#1 branch
.. //depot/projects/pci/sys/dev/isp/isp.c#5 integrate
.. //depot/projects/pci/sys/dev/isp/ispreg.h#3 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwn.c#7 integrate
.. //depot/projects/pci/sys/dev/iwn/if_iwnvar.h#5 integrate
.. //depot/projects/pci/sys/dev/ixgb/if_ixgb.c#5 integrate
.. //depot/projects/pci/sys/dev/ixgb/ixgb_ids.h#3 integrate
.. //depot/projects/pci/sys/dev/ixgbe/ixgbe.c#7 integrate
.. //depot/projects/pci/sys/dev/ixgbe/ixv.c#7 integrate
.. //depot/projects/pci/sys/dev/mbox/mbox_if.m#1 branch
.. //depot/projects/pci/sys/dev/mem/memdev.c#3 integrate
.. //depot/projects/pci/sys/dev/mfi/mfi.c#7 integrate
.. //depot/projects/pci/sys/dev/mmc/mmcsd.c#5 integrate
.. //depot/projects/pci/sys/dev/nvd/nvd.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme.h#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_ctrlr.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_ctrlr_cmd.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_ns.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_private.h#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_qpair.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_sysctl.c#3 integrate
.. //depot/projects/pci/sys/dev/nvme/nvme_test.c#3 integrate
.. //depot/projects/pci/sys/dev/oce/oce_hw.c#5 integrate
.. //depot/projects/pci/sys/dev/oce/oce_hw.h#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_if.c#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_if.h#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_mbox.c#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_queue.c#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_sysctl.c#4 integrate
.. //depot/projects/pci/sys/dev/oce/oce_util.c#4 integrate
.. //depot/projects/pci/sys/dev/pci/pci.c#44 integrate
.. //depot/projects/pci/sys/dev/pci/pci_pci.c#42 integrate
.. //depot/projects/pci/sys/dev/pci/pci_private.h#17 integrate
.. //depot/projects/pci/sys/dev/pci/pcib_private.h#26 integrate
.. //depot/projects/pci/sys/dev/pci/pcivar.h#12 integrate
.. //depot/projects/pci/sys/dev/qlxgbe/ql_os.c#2 integrate
.. //depot/projects/pci/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/pci/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/pci/sys/dev/ral/rt2860.c#2 integrate
.. //depot/projects/pci/sys/dev/random/probe.c#4 integrate
.. //depot/projects/pci/sys/dev/random/randomdev.c#3 integrate
.. //depot/projects/pci/sys/dev/random/randomdev.h#3 integrate
.. //depot/projects/pci/sys/dev/random/randomdev_soft.c#4 integrate
.. //depot/projects/pci/sys/dev/sound/pci/hda/hdaa_patches.c#4 integrate
.. //depot/projects/pci/sys/dev/sound/pci/hda/hdac.h#5 integrate
.. //depot/projects/pci/sys/dev/syscons/syscons.c#7 integrate
.. //depot/projects/pci/sys/dev/uart/uart.h#4 integrate
.. //depot/projects/pci/sys/dev/uart/uart_bus_fdt.c#5 integrate
.. //depot/projects/pci/sys/dev/uart/uart_core.c#5 integrate
.. //depot/projects/pci/sys/dev/uart/uart_cpu_fdt.c#2 integrate
.. //depot/projects/pci/sys/dev/uart/uart_subr.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/controller/musb_otg.c#5 integrate
.. //depot/projects/pci/sys/dev/usb/controller/musb_otg.h#4 integrate
.. //depot/projects/pci/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate
.. //depot/projects/pci/sys/dev/usb/controller/xhci.h#5 integrate
.. //depot/projects/pci/sys/dev/usb/controller/xhci_pci.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/input/ukbd.c#9 integrate
.. //depot/projects/pci/sys/dev/usb/quirk/usb_quirk.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_rum.c#7 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_uath.c#7 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_upgt.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_ural.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_urtw.c#6 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_urtwn.c#2 integrate
.. //depot/projects/pci/sys/dev/usb/wlan/if_zyd.c#8 integrate
.. //depot/projects/pci/sys/dev/virtio/balloon/virtio_balloon.c#3 integrate
.. //depot/projects/pci/sys/dev/virtio/block/virtio_blk.c#4 integrate
.. //depot/projects/pci/sys/dev/virtio/block/virtio_blk.h#3 integrate
.. //depot/projects/pci/sys/dev/virtio/network/if_vtnet.c#4 integrate
.. //depot/projects/pci/sys/dev/virtio/network/if_vtnetvar.h#3 integrate
.. //depot/projects/pci/sys/dev/virtio/pci/virtio_pci.c#4 integrate
.. //depot/projects/pci/sys/dev/virtio/scsi/virtio_scsi.c#3 integrate
.. //depot/projects/pci/sys/dev/virtio/scsi/virtio_scsivar.h#2 integrate
.. //depot/projects/pci/sys/dev/virtio/virtio.c#3 integrate
.. //depot/projects/pci/sys/dev/virtio/virtio.h#3 integrate
.. //depot/projects/pci/sys/dev/virtio/virtio_bus_if.m#3 integrate
.. //depot/projects/pci/sys/dev/virtio/virtio_if.m#3 integrate
.. //depot/projects/pci/sys/dev/virtio/virtqueue.c#3 integrate
.. //depot/projects/pci/sys/dev/virtio/virtqueue.h#3 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_dir.h#5 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_extern.h#6 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_hash.c#1 branch
.. //depot/projects/pci/sys/fs/ext2fs/ext2_htree.c#1 branch
.. //depot/projects/pci/sys/fs/ext2fs/ext2_inode_cnv.c#5 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_lookup.c#7 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_vfsops.c#8 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2_vnops.c#7 integrate
.. //depot/projects/pci/sys/fs/ext2fs/ext2fs.h#7 integrate
.. //depot/projects/pci/sys/fs/ext2fs/htree.h#1 branch
.. //depot/projects/pci/sys/fs/fuse/fuse_internal.h#2 integrate
.. //depot/projects/pci/sys/fs/fuse/fuse_kernel.h#2 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs.h#6 integrate
.. //depot/projects/pci/sys/fs/nfs/nfs_commonkrpc.c#10 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clport.c#11 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clvfsops.c#8 integrate
.. //depot/projects/pci/sys/fs/nullfs/null_vnops.c#6 integrate
.. //depot/projects/pci/sys/fs/smbfs/smbfs_node.c#4 integrate
.. //depot/projects/pci/sys/fs/smbfs/smbfs_smb.c#6 integrate
.. //depot/projects/pci/sys/fs/smbfs/smbfs_vfsops.c#5 integrate
.. //depot/projects/pci/sys/fs/smbfs/smbfs_vnops.c#5 integrate
.. //depot/projects/pci/sys/geom/geom_disk.c#8 integrate
.. //depot/projects/pci/sys/geom/geom_disk.h#5 integrate
.. //depot/projects/pci/sys/geom/journal/g_journal.c#6 integrate
.. //depot/projects/pci/sys/i386/conf/GENERIC#10 integrate
.. //depot/projects/pci/sys/i386/conf/NOTES#7 integrate
.. //depot/projects/pci/sys/i386/conf/PAE#7 integrate
.. //depot/projects/pci/sys/i386/conf/XEN#4 integrate
.. //depot/projects/pci/sys/i386/i386/pmap.c#8 integrate
.. //depot/projects/pci/sys/i386/i386/support.s#5 integrate
.. //depot/projects/pci/sys/i386/i386/symbols.raw#3 integrate
.. //depot/projects/pci/sys/i386/i386/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/pci/sys/i386/include/counter.h#2 integrate
.. //depot/projects/pci/sys/ia64/include/counter.h#2 integrate
.. //depot/projects/pci/sys/kern/Make.tags.inc#4 integrate
.. //depot/projects/pci/sys/kern/kern_acct.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_clock.c#7 integrate
.. //depot/projects/pci/sys/kern/kern_descrip.c#11 integrate
.. //depot/projects/pci/sys/kern/kern_intr.c#9 integrate
.. //depot/projects/pci/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_priv.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_rmlock.c#7 integrate
.. //depot/projects/pci/sys/kern/kern_synch.c#6 integrate
.. //depot/projects/pci/sys/kern/kern_time.c#5 integrate
.. //depot/projects/pci/sys/kern/subr_bus.c#11 integrate
.. //depot/projects/pci/sys/kern/subr_counter.c#2 integrate
.. //depot/projects/pci/sys/kern/subr_witness.c#5 integrate
.. //depot/projects/pci/sys/kern/sys_generic.c#6 integrate
.. //depot/projects/pci/sys/kern/uipc_mbuf.c#5 integrate
.. //depot/projects/pci/sys/kern/uipc_syscalls.c#8 integrate
.. //depot/projects/pci/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/pci/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/pci/sys/kern/vfs_cache.c#6 integrate
.. //depot/projects/pci/sys/kern/vfs_init.c#5 integrate
.. //depot/projects/pci/sys/kern/vfs_mount.c#11 integrate
.. //depot/projects/pci/sys/kern/vfs_subr.c#12 integrate
.. //depot/projects/pci/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/pci/sys/kgssapi/gss_impl.c#6 integrate
.. //depot/projects/pci/sys/mips/atheros/ar71xx_setup.h#4 integrate
.. //depot/projects/pci/sys/mips/atheros/ar934xreg.h#1 branch
.. //depot/projects/pci/sys/mips/conf/AP93.hints#2 integrate
.. //depot/projects/pci/sys/mips/conf/ENH200#1 branch
.. //depot/projects/pci/sys/mips/conf/ENH200.hints#1 branch
.. //depot/projects/pci/sys/mips/include/atomic.h#4 integrate
.. //depot/projects/pci/sys/mips/include/counter.h#2 integrate
.. //depot/projects/pci/sys/mips/include/elf.h#5 integrate
.. //depot/projects/pci/sys/mips/mips/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/mips/mips/vm_machdep.c#7 integrate
.. //depot/projects/pci/sys/modules/Makefile#11 integrate
.. //depot/projects/pci/sys/modules/cc/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/cc/cc_cdg/Makefile#1 branch
.. //depot/projects/pci/sys/modules/cxgbe/Makefile#6 integrate
.. //depot/projects/pci/sys/modules/cxgbe/t4_firmware/Makefile#2 integrate
.. //depot/projects/pci/sys/modules/cxgbe/t5_firmware/Makefile#1 branch
.. //depot/projects/pci/sys/modules/em/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/ext2fs/Makefile#4 integrate
.. //depot/projects/pci/sys/modules/hpt27xx/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/hptnr/Makefile#1 branch
.. //depot/projects/pci/sys/modules/igb/Makefile#4 integrate
.. //depot/projects/pci/sys/modules/usb/Makefile#8 integrate
.. //depot/projects/pci/sys/modules/usb/urtwnfw/Makefile#1 branch
.. //depot/projects/pci/sys/modules/usb/urtwnfw/Makefile.inc#1 branch
.. //depot/projects/pci/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile#1 branch
.. //depot/projects/pci/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile#1 branch
.. //depot/projects/pci/sys/net/ieee8023ad_lacp.c#5 integrate
.. //depot/projects/pci/sys/net/if.c#7 integrate
.. //depot/projects/pci/sys/net/if_arp.h#4 integrate
.. //depot/projects/pci/sys/net/if_bridge.c#6 integrate
.. //depot/projects/pci/sys/net/if_gif.c#6 integrate
.. //depot/projects/pci/sys/net/if_lagg.c#10 integrate
.. //depot/projects/pci/sys/net/if_lagg.h#6 integrate
.. //depot/projects/pci/sys/net/if_var.h#8 integrate
.. //depot/projects/pci/sys/net/rtsock.c#5 integrate
.. //depot/projects/pci/sys/net/vnet.h#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_amrr.c#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_ioctl.c#6 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_mesh.c#7 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_output.c#9 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_phy.c#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_phy.h#3 integrate
.. //depot/projects/pci/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate
.. //depot/projects/pci/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate
.. //depot/projects/pci/sys/netgraph/ng_base.c#8 integrate
.. //depot/projects/pci/sys/netinet/cc/cc_cdg.c#1 branch
.. //depot/projects/pci/sys/netinet/icmp6.h#6 integrate
.. //depot/projects/pci/sys/netinet/icmp_var.h#3 integrate
.. //depot/projects/pci/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/pci/sys/netinet/in.c#8 integrate
.. //depot/projects/pci/sys/netinet/in_mcast.c#4 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/pci/sys/netinet/in_pcb.h#9 integrate
.. //depot/projects/pci/sys/netinet/ip_carp.c#6 integrate
.. //depot/projects/pci/sys/netinet/ip_carp.h#5 integrate
.. //depot/projects/pci/sys/netinet/ip_icmp.c#6 integrate
.. //depot/projects/pci/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/pci/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/pci/sys/netinet/ip_mroute.h#3 integrate
.. //depot/projects/pci/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/pci/sys/netinet/ip_var.h#7 integrate
.. //depot/projects/pci/sys/netinet/pim_var.h#3 integrate
.. //depot/projects/pci/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/pci/sys/netinet/sctp_indata.c#7 integrate
.. //depot/projects/pci/sys/netinet/sctp_indata.h#5 integrate
.. //depot/projects/pci/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/pci/sys/netinet/sctp_pcb.c#9 integrate
.. //depot/projects/pci/sys/netinet/sctp_sysctl.c#7 integrate
.. //depot/projects/pci/sys/netinet/sctp_sysctl.h#6 integrate
.. //depot/projects/pci/sys/netinet/tcp_input.c#9 integrate
.. //depot/projects/pci/sys/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/pci/sys/netinet/tcp_syncache.h#4 integrate
.. //depot/projects/pci/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/pci/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/pci/sys/netinet/udp_var.h#4 integrate
.. //depot/projects/pci/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/pci/sys/netinet6/in6.c#8 integrate
.. //depot/projects/pci/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/pci/sys/netinet6/in6_pcb.c#8 integrate
.. //depot/projects/pci/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/pci/sys/netinet6/in6_var.h#5 integrate
.. //depot/projects/pci/sys/netinet6/ip6_input.c#7 integrate
.. //depot/projects/pci/sys/netinet6/ip6_mroute.h#3 integrate
.. //depot/projects/pci/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/pci/sys/netinet6/ip6_var.h#6 integrate
.. //depot/projects/pci/sys/netinet6/nd6.c#9 integrate
.. //depot/projects/pci/sys/netinet6/pim6_var.h#3 integrate
.. //depot/projects/pci/sys/netinet6/raw_ip6.c#5 integrate
.. //depot/projects/pci/sys/netinet6/raw_ip6.h#4 integrate
.. //depot/projects/pci/sys/netipsec/ah_var.h#4 integrate
.. //depot/projects/pci/sys/netipsec/esp_var.h#4 integrate
.. //depot/projects/pci/sys/netipsec/ipcomp_var.h#4 integrate
.. //depot/projects/pci/sys/netipsec/ipip_var.h#4 integrate
.. //depot/projects/pci/sys/netipsec/ipsec.c#4 integrate
.. //depot/projects/pci/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/pci/sys/netipsec/ipsec6.h#4 integrate
.. //depot/projects/pci/sys/netipsec/keysock.c#4 integrate
.. //depot/projects/pci/sys/netipsec/keysock.h#4 integrate
.. //depot/projects/pci/sys/netipsec/xform_ah.c#7 integrate
.. //depot/projects/pci/sys/netipsec/xform_esp.c#7 integrate
.. //depot/projects/pci/sys/netipsec/xform_ipcomp.c#6 integrate
.. //depot/projects/pci/sys/netipsec/xform_ipip.c#7 integrate
.. //depot/projects/pci/sys/netsmb/smb_conn.c#5 integrate
.. //depot/projects/pci/sys/nfsclient/nfs_subs.c#7 integrate
.. //depot/projects/pci/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/pci/sys/ofed/drivers/net/mlx4/main.c#2 integrate
.. //depot/projects/pci/sys/ofed/include/linux/sysfs.h#2 integrate
.. //depot/projects/pci/sys/powerpc/aim/mmu_oea64.c#9 integrate
.. //depot/projects/pci/sys/powerpc/aim/vm_machdep.c#3 integrate
.. //depot/projects/pci/sys/powerpc/booke/vm_machdep.c#3 integrate
.. //depot/projects/pci/sys/powerpc/include/counter.h#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/powerpc/wii/wii_ipcreg.h#2 integrate
.. //depot/projects/pci/sys/rpc/rpcsec_gss.h#4 integrate
.. //depot/projects/pci/sys/rpc/rpcsec_gss/rpcsec_gss.c#3 integrate
.. //depot/projects/pci/sys/security/audit/audit.c#4 integrate
.. //depot/projects/pci/sys/sparc64/include/counter.h#2 integrate
.. //depot/projects/pci/sys/sparc64/include/ucontext.h#3 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/machdep.c#8 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/uio_machdep.c#3 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/vm_machdep.c#6 integrate
.. //depot/projects/pci/sys/sys/counter.h#2 integrate
.. //depot/projects/pci/sys/sys/elf_common.h#6 integrate
.. //depot/projects/pci/sys/sys/eventhandler.h#5 integrate
.. //depot/projects/pci/sys/sys/mbuf.h#7 integrate
.. //depot/projects/pci/sys/sys/param.h#11 integrate
.. //depot/projects/pci/sys/sys/priv.h#6 integrate
.. //depot/projects/pci/sys/sys/sdt.h#5 integrate
.. //depot/projects/pci/sys/sys/sf_buf.h#3 integrate
.. //depot/projects/pci/sys/sys/socketvar.h#4 integrate
.. //depot/projects/pci/sys/sys/stdatomic.h#2 integrate
.. //depot/projects/pci/sys/sys/systm.h#11 integrate
.. //depot/projects/pci/sys/sys/vnode.h#10 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#12 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_balloc.c#6 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_snapshot.c#8 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_suspend.c#2 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_vfsops.c#9 integrate
.. //depot/projects/pci/sys/ufs/ufs/dinode.h#4 integrate
.. //depot/projects/pci/sys/ufs/ufs/inode.h#8 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_extattr.c#5 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_vnops.c#7 integrate
.. //depot/projects/pci/sys/vm/swap_pager.c#8 integrate
.. //depot/projects/pci/sys/vm/uma_core.c#7 integrate
.. //depot/projects/pci/sys/vm/vm_fault.c#9 integrate
.. //depot/projects/pci/sys/vm/vm_map.c#8 integrate
.. //depot/projects/pci/sys/vm/vm_map.h#5 integrate
.. //depot/projects/pci/sys/vm/vm_object.c#8 integrate
.. //depot/projects/pci/sys/vm/vm_object.h#6 integrate
.. //depot/projects/pci/sys/vm/vm_page.c#9 integrate
.. //depot/projects/pci/sys/vm/vm_phys.c#5 integrate
Differences ...
==== //depot/projects/pci/sys/amd64/amd64/machdep.c#9 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 251039 2013-05-27 18:39:39Z kib $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 253352 2013-07-15 06:30:57Z kib $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -1228,6 +1228,36 @@
ip++;
}
}
+
+/* Show privileged registers. */
+DB_SHOW_COMMAND(sysregs, db_show_sysregs)
+{
+ struct {
+ uint16_t limit;
+ uint64_t base;
+ } __packed idtr, gdtr;
+ uint16_t ldt, tr;
+
+ __asm __volatile("sidt %0" : "=m" (idtr));
+ db_printf("idtr\t0x%016lx/%04x\n",
+ (u_long)idtr.base, (u_int)idtr.limit);
+ __asm __volatile("sgdt %0" : "=m" (gdtr));
+ db_printf("gdtr\t0x%016lx/%04x\n",
+ (u_long)gdtr.base, (u_int)gdtr.limit);
+ __asm __volatile("sldt %0" : "=r" (ldt));
+ db_printf("ldtr\t0x%04x\n", ldt);
+ __asm __volatile("str %0" : "=r" (tr));
+ db_printf("tr\t0x%04x\n", tr);
+ db_printf("cr0\t0x%016lx\n", rcr0());
+ db_printf("cr2\t0x%016lx\n", rcr2());
+ db_printf("cr3\t0x%016lx\n", rcr3());
+ db_printf("cr4\t0x%016lx\n", rcr4());
+ db_printf("EFER\t%016lx\n", rdmsr(MSR_EFER));
+ db_printf("FEATURES_CTL\t%016lx\n", rdmsr(MSR_IA32_FEATURE_CONTROL));
+ db_printf("DEBUG_CTL\t%016lx\n", rdmsr(MSR_DEBUGCTLMSR));
+ db_printf("PAT\t%016lx\n", rdmsr(MSR_PAT));
+ db_printf("GSBASE\t%016lx\n", rdmsr(MSR_GSBASE));
+}
#endif
void
==== //depot/projects/pci/sys/amd64/amd64/pmap.c#8 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 251720 2013-06-14 00:03:43Z neel $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 253140 2013-07-10 09:24:03Z kib $");
/*
* Manages physical address maps.
@@ -2234,6 +2234,7 @@
if (m_pc == NULL && free != NULL) {
m_pc = free;
free = (void *)m_pc->object;
+ m_pc->object = NULL;
/* Recycle a freed page table page. */
m_pc->wire_count = 1;
atomic_add_int(&cnt.v_wire_count, 1);
@@ -4400,6 +4401,7 @@
int64_t bit;
uint64_t inuse, bitmask;
int allfree, field, freed, idx;
+ vm_paddr_t pa;
if (pmap != PCPU_GET(curpmap)) {
printf("warning: pmap_remove_pages called with non-current pmap\n");
@@ -4429,7 +4431,7 @@
pte = (pt_entry_t *)PHYS_TO_DMAP(tpte &
PG_FRAME);
pte = &pte[pmap_pte_index(pv->pv_va)];
- tpte = *pte & ~PG_PTE_PAT;
+ tpte = *pte;
}
if ((tpte & PG_V) == 0) {
panic("bad pte va %lx pte %lx",
@@ -4444,8 +4446,13 @@
continue;
}
- m = PHYS_TO_VM_PAGE(tpte & PG_FRAME);
- KASSERT(m->phys_addr == (tpte & PG_FRAME),
+ if (tpte & PG_PS)
+ pa = tpte & PG_PS_FRAME;
+ else
+ pa = tpte & PG_FRAME;
+
+ m = PHYS_TO_VM_PAGE(pa);
+ KASSERT(m->phys_addr == pa,
("vm_page_t %p phys_addr mismatch %016jx %016jx",
m, (uintmax_t)m->phys_addr,
(uintmax_t)tpte));
==== //depot/projects/pci/sys/amd64/conf/GENERIC#10 (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 250963 2013-05-24 09:22:43Z achim $
+# $FreeBSD: head/sys/amd64/conf/GENERIC 252867 2013-07-06 07:49:41Z delphij $
cpu HAMMER
ident GENERIC
@@ -147,6 +147,7 @@
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
device hptmv # Highpoint RocketRAID 182x
+device hptnr # Highpoint DC7280, R750
device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
device hpt27xx # Highpoint RocketRAID 27xx
device iir # Intel Integrated RAID
==== //depot/projects/pci/sys/amd64/conf/NOTES#7 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: head/sys/amd64/conf/NOTES 250963 2013-05-24 09:22:43Z achim $
+# $FreeBSD: head/sys/amd64/conf/NOTES 252867 2013-07-06 07:49:41Z delphij $
#
#
@@ -418,6 +418,10 @@
device hptmv
#
+# Highpoint DC7280 and R750.
+device hptnr
+
+#
# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340,
# RR2210, RR174x, RR2522, RR231x, RR230x.
device hptrr
==== //depot/projects/pci/sys/amd64/include/counter.h#2 (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/counter.h 252032 2013-06-20 14:30:04Z kib $
+ * $FreeBSD: head/sys/amd64/include/counter.h 252434 2013-07-01 02:48:27Z kib $
*/
#ifndef __MACHINE_COUNTER_H__
@@ -36,6 +36,44 @@
#define counter_enter() do {} while (0)
#define counter_exit() do {} while (0)
+#ifdef IN_SUBR_COUNTER_C
+static inline uint64_t
+counter_u64_read_one(uint64_t *p, int cpu)
+{
+
+ return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu));
+}
+
+static inline uint64_t
+counter_u64_fetch_inline(uint64_t *p)
+{
+ uint64_t r;
+ int i;
+
+ r = 0;
+ for (i = 0; i < mp_ncpus; i++)
+ r += counter_u64_read_one((uint64_t *)p, i);
+
+ return (r);
+}
+
+static void
+counter_u64_zero_one_cpu(void *arg)
+{
+
+ *((uint64_t *)((char *)arg + sizeof(struct pcpu) *
+ PCPU_GET(cpuid))) = 0;
+}
+
+static inline void
+counter_u64_zero_inline(counter_u64_t c)
+{
+
+ smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
+ smp_no_rendevous_barrier, c);
+}
+#endif
+
#define counter_u64_add_protected(c, i) counter_u64_add(c, i)
static inline void
==== //depot/projects/pci/sys/amd64/vmm/intel/ept.c#2 (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/ept.c 245678 2013-01-20 03:42:49Z neel $
+ * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 252475 2013-07-01 20:05:43Z grehan $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 245678 2013-01-20 03:42:49Z neel $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 252475 2013-07-01 20:05:43Z grehan $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -77,6 +77,11 @@
static uint64_t page_sizes_mask;
+/*
+ * Set this to 1 to have the EPT tables respect the guest PAT settings
+ */
+static int ept_pat_passthru;
+
int
ept_init(void)
{
@@ -226,10 +231,13 @@
ptp[ptpindex] |= EPT_PG_EX;
/*
- * XXX should we enforce this memory type by setting the
- * ignore PAT bit to 1.
+ * By default the PAT type is ignored - this appears to
+ * be how other hypervisors handle EPT. Allow this to be
+ * overridden.
*/
ptp[ptpindex] |= EPT_PG_MEMORY_TYPE(attr);
+ if (!ept_pat_passthru)
+ ptp[ptpindex] |= EPT_PG_IGNORE_PAT;
if (nlevels > 0)
ptp[ptpindex] |= EPT_PG_SUPERPAGE;
==== //depot/projects/pci/sys/amd64/vmm/vmm_instruction_emul.c#3 (text+ko) ====
@@ -24,11 +24,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 250175 2013-05-02 12:35:15Z emaste $
+ * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 252641 2013-07-03 23:05:17Z neel $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 250175 2013-05-02 12:35:15Z emaste $");
+__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 252641 2013-07-03 23:05:17Z neel $");
#ifdef _KERNEL
#include <sys/param.h>
@@ -780,6 +780,19 @@
}
/*
+ * Verify that all the bytes in the instruction buffer were consumed.
+ */
+static int
+verify_inst_length(struct vie *vie)
+{
+
+ if (vie->num_processed == vie->num_valid)
+ return (0);
+ else
+ return (-1);
+}
+
+/*
* Verify that the 'guest linear address' provided as collateral of the nested
* page table fault matches with our instruction decoding.
*/
@@ -853,6 +866,9 @@
if (decode_immediate(vie))
return (-1);
+ if (verify_inst_length(vie))
+ return (-1);
+
if (verify_gla(vm, cpuid, gla, vie))
return (-1);
==== //depot/projects/pci/sys/arm/arm/bus_space_generic.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/bus_space_generic.c 177888 2008-04-03 18:28:34Z raj $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/bus_space_generic.c 252424 2013-06-30 19:36:17Z cognet $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@
offset = bpa & PAGE_MASK;
startpa = trunc_page(bpa);
- va = kmem_alloc(kernel_map, endpa - startpa);
+ va = kmem_alloc_nofault(kernel_map, endpa - startpa);
if (va == 0)
return (ENOMEM);
==== //depot/projects/pci/sys/arm/arm/busdma_machdep-v6.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 248655 2013-03-23 17:17:06Z ian $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/busdma_machdep-v6.c 252652 2013-07-03 23:38:02Z gonzo $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -192,14 +192,26 @@
static void
busdma_init(void *dummy)
{
+ int uma_flags;
+
+ uma_flags = 0;
/* Create a cache of buffers in standard (cacheable) memory. */
standard_allocator = busdma_bufalloc_create("buffer",
arm_dcache_align, /* minimum_alignment */
NULL, /* uma_alloc func */
NULL, /* uma_free func */
- 0); /* uma_zcreate_flags */
+ uma_flags); /* uma_zcreate_flags */
+#ifdef INVARIANTS
+ /*
+ * Force UMA zone to allocate service structures like
+ * slabs using own allocator. uma_debug code performs
+ * atomic ops on uma_slab_t fields and safety of this
+ * operation is not guaranteed for write-back caches
+ */
+ uma_flags = UMA_ZONE_OFFPAGE;
+#endif
/*
* Create a cache of buffers in uncacheable memory, to implement the
* BUS_DMA_COHERENT (and potentially BUS_DMA_NOCACHE) flag.
@@ -208,7 +220,7 @@
arm_dcache_align, /* minimum_alignment */
busdma_bufalloc_alloc_uncacheable,
busdma_bufalloc_free_uncacheable,
- 0); /* uma_zcreate_flags */
+ uma_flags); /* uma_zcreate_flags */
}
/*
==== //depot/projects/pci/sys/arm/arm/cpufunc.c#4 (text+ko) ====
@@ -45,7 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc.c 249999 2013-04-27 23:07:49Z wkoszek $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/cpufunc.c 252361 2013-06-28 22:31:17Z ray $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1481,7 +1481,8 @@
cputype == CPU_ID_CORTEXA8R3 ||
cputype == CPU_ID_CORTEXA9R1 ||
cputype == CPU_ID_CORTEXA9R2 ||
- cputype == CPU_ID_CORTEXA9R3) {
+ cputype == CPU_ID_CORTEXA9R3 ||
+ cputype == CPU_ID_CORTEXA15 ) {
cpufuncs = cortexa_cpufuncs;
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
get_cachetype_cp15();
==== //depot/projects/pci/sys/arm/arm/db_trace.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/db_trace.c 252320 2013-06-27 22:26:56Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/db_trace.c 253309 2013-07-13 00:39:07Z rpaulo $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -515,11 +515,11 @@
db_printsym(scp, DB_STGY_PROC);
db_printf("\n");
#ifdef __PROG26
- db_printf("scp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC);
+ db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC);
db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC);
db_printf(")\n");
#else
- db_printf("scp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV]);
+ db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV]);
db_printsym(frame[FR_RLV], DB_STGY_PROC);
db_printf(")\n");
#endif
==== //depot/projects/pci/sys/arm/arm/elf_trampoline.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
#include "opt_kernname.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/elf_trampoline.c 248364 2013-03-16 03:50:27Z andrew $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/elf_trampoline.c 253005 2013-07-07 21:20:52Z rpaulo $");
#include <machine/asm.h>
#include <sys/param.h>
#include <sys/elf32.h>
@@ -49,42 +49,59 @@
void __start(void);
void __startC(void);
+extern unsigned int cpufunc_id(void);
+extern void armv6_idcache_wbinv_all(void);
+extern void armv7_idcache_wbinv_all(void);
+extern void do_call(void *, void *, void *, int);
+
#define GZ_HEAD 0xa
#ifdef CPU_ARM7TDMI
#define cpu_idcache_wbinv_all arm7tdmi_cache_flushID
+extern void arm7tdmi_cache_flushID(void);
#elif defined(CPU_ARM8)
#define cpu_idcache_wbinv_all arm8_cache_purgeID
+extern void arm8_cache_purgeID(void);
#elif defined(CPU_ARM9)
#define cpu_idcache_wbinv_all arm9_idcache_wbinv_all
+extern void arm9_idcache_wbinv_all(void);
#elif defined(CPU_FA526) || defined(CPU_FA626TE)
#define cpu_idcache_wbinv_all fa526_idcache_wbinv_all
+extern void fa526_idcache_wbinv_all(void);
#elif defined(CPU_ARM9E)
#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all
+extern void armv5_ec_idcache_wbinv_all(void);
#elif defined(CPU_ARM10)
#define cpu_idcache_wbinv_all arm10_idcache_wbinv_all
+extern void arm10_idcache_wbinv_all(void);
#elif defined(CPU_ARM1136) || defined(CPU_ARM1176)
#define cpu_idcache_wbinv_all armv6_idcache_wbinv_all
#elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \
defined(CPU_IXP12X0)
#define cpu_idcache_wbinv_all sa1_cache_purgeID
+extern void sa1_cache_purgeID(void);
#elif defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
defined(CPU_XSCALE_80219)
#define cpu_idcache_wbinv_all xscale_cache_purgeID
+extern void xscale_cache_purgeID(void);
#elif defined(CPU_XSCALE_81342)
#define cpu_idcache_wbinv_all xscalec3_cache_purgeID
+extern void xscalec3_cache_purgeID(void);
#elif defined(CPU_MV_PJ4B)
#if !defined(SOC_MV_ARMADAXP)
#define cpu_idcache_wbinv_all armv6_idcache_wbinv_all
+extern void armv6_idcache_wbinv_all(void);
#else
#define cpu_idcache_wbinv_all() armadaxp_idcache_wbinv_all
#endif
#endif /* CPU_MV_PJ4B */
#ifdef CPU_XSCALE_81342
#define cpu_l2cache_wbinv_all xscalec3_l2cache_purge
+extern void xscalec3_l2cache_purge(void);
#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
#define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all
+extern void sheeva_l2cache_wbinv_all(void);
#elif defined(CPU_CORTEXA)
#define cpu_idcache_wbinv_all armv7_idcache_wbinv_all
#define cpu_l2cache_wbinv_all()
@@ -434,11 +451,11 @@
inflate_kernel(void *kernel, void *startaddr)
{
struct inflate infl;
- char slide[GZ_WSIZE];
+ unsigned char slide[GZ_WSIZE];
orig_input = kernel;
memcnt = memtot = 0;
- i_input = (char *)kernel + GZ_HEAD;
+ i_input = (unsigned char *)kernel + GZ_HEAD;
if (((char *)kernel)[3] & 0x18) {
while (*i_input)
i_input++;
@@ -590,6 +607,8 @@
__asm __volatile(".globl func_end\n"
"func_end:");
+ /* NOTREACHED */
+ return NULL;
}
extern char func_end[];
==== //depot/projects/pci/sys/arm/arm/gic.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 249762 2013-04-22 08:28:53Z dmarion $");
+__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 252370 2013-06-29 12:08:26Z ray $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list