svn commit: r324677 - in projects/pnfs-planb-server/sys: amd64/amd64 amd64/include arm/allwinner arm/allwinner/clkng arm/allwinner/h3 arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm...

Mon Oct 16 23:40:30 UTC 2017

Author: rmacklem
Date: Mon Oct 16 23:40:24 2017
New Revision: 324677
URL: https://svnweb.freebsd.org/changeset/base/324677

Log:
  Merge in a current kernel from head.

Added:
  projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_sun8i_r.c
     - copied unchanged from r324676, head/sys/arm/allwinner/clkng/ccu_sun8i_r.c
  projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_sun8i_r.h
     - copied unchanged from r324676, head/sys/arm/allwinner/clkng/ccu_sun8i_r.h
  projects/pnfs-planb-server/sys/arm/conf/VIRT
     - copied unchanged from r324676, head/sys/arm/conf/VIRT
  projects/pnfs-planb-server/sys/arm/conf/std.armv7
     - copied unchanged from r324676, head/sys/arm/conf/std.armv7
  projects/pnfs-planb-server/sys/arm64/arm64/efirt_machdep.c
     - copied unchanged from r324676, head/sys/arm64/arm64/efirt_machdep.c
  projects/pnfs-planb-server/sys/arm64/include/fpu.h
     - copied unchanged from r324676, head/sys/arm64/include/fpu.h
  projects/pnfs-planb-server/sys/boot/defs.mk
     - copied unchanged from r324676, head/sys/boot/defs.mk
  projects/pnfs-planb-server/sys/boot/efi/libefi/efi_main.c
     - copied unchanged from r324676, head/sys/boot/efi/libefi/efi_main.c
  projects/pnfs-planb-server/sys/boot/ficl.mk
     - copied unchanged from r324676, head/sys/boot/ficl.mk
  projects/pnfs-planb-server/sys/boot/libsa/
     - copied from r324676, head/sys/boot/libsa/
  projects/pnfs-planb-server/sys/boot/libsa32/
     - copied from r324676, head/sys/boot/libsa32/
  projects/pnfs-planb-server/sys/boot/loader.mk
     - copied unchanged from r324676, head/sys/boot/loader.mk
  projects/pnfs-planb-server/sys/boot/man/
     - copied from r324676, head/sys/boot/man/
  projects/pnfs-planb-server/sys/boot/userboot/Makefile.inc
     - copied unchanged from r324676, head/sys/boot/userboot/Makefile.inc
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslallocate.c
     - copied unchanged from r324676, head/sys/contrib/dev/acpica/compiler/aslallocate.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcache.c
     - copied unchanged from r324676, head/sys/contrib/dev/acpica/compiler/aslcache.c
  projects/pnfs-planb-server/sys/contrib/dev/iwm/iwm-8265-22.fw.uu
     - copied unchanged from r324676, head/sys/contrib/dev/iwm/iwm-8265-22.fw.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw-1.16.63.0.bin.uu
     - copied unchanged from r324676, head/sys/dev/cxgbe/firmware/t4fw-1.16.63.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t5fw-1.16.63.0.bin.uu
     - copied unchanged from r324676, head/sys/dev/cxgbe/firmware/t5fw-1.16.63.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t6fw-1.16.63.0.bin.uu
     - copied unchanged from r324676, head/sys/dev/cxgbe/firmware/t6fw-1.16.63.0.bin.uu
  projects/pnfs-planb-server/sys/modules/iwmfw/iwm8265fw/
     - copied from r324676, head/sys/modules/iwmfw/iwm8265fw/
Deleted:
  projects/pnfs-planb-server/sys/boot/Makefile.ficl
  projects/pnfs-planb-server/sys/boot/common/Makefile
  projects/pnfs-planb-server/sys/boot/common/Makefile.inc
  projects/pnfs-planb-server/sys/boot/common/crc32.c
  projects/pnfs-planb-server/sys/boot/common/crc32.h
  projects/pnfs-planb-server/sys/boot/common/gpt.c
  projects/pnfs-planb-server/sys/boot/common/gpt.h
  projects/pnfs-planb-server/sys/boot/common/loader.8
  projects/pnfs-planb-server/sys/boot/common/panic.c
  projects/pnfs-planb-server/sys/boot/common/ufsread.c
  projects/pnfs-planb-server/sys/boot/common/util.c
  projects/pnfs-planb-server/sys/boot/common/util.h
  projects/pnfs-planb-server/sys/boot/common/zfsloader.8
  projects/pnfs-planb-server/sys/boot/efi/boot1/boot_module.h
  projects/pnfs-planb-server/sys/boot/efi/boot1/ufs_module.c
  projects/pnfs-planb-server/sys/boot/efi/boot1/zfs_module.c
  projects/pnfs-planb-server/sys/boot/efi/loader/efi_main.c
  projects/pnfs-planb-server/sys/boot/libstand32/Makefile
  projects/pnfs-planb-server/sys/boot/libstand32/Makefile.depend
  projects/pnfs-planb-server/sys/boot/userboot/libstand/Makefile
  projects/pnfs-planb-server/sys/boot/userboot/libstand/Makefile.depend
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
Modified:
  projects/pnfs-planb-server/sys/amd64/amd64/pmap.c
  projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c
  projects/pnfs-planb-server/sys/amd64/include/pmap.h
  projects/pnfs-planb-server/sys/arm/allwinner/a10_ehci.c
  projects/pnfs-planb-server/sys/arm/allwinner/clkng/aw_ccung.c
  projects/pnfs-planb-server/sys/arm/allwinner/h3/files.h3
  projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner
  projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner_up
  projects/pnfs-planb-server/sys/arm/altera/socfpga/std.socfpga
  projects/pnfs-planb-server/sys/arm/amlogic/aml8726/std.aml8726
  projects/pnfs-planb-server/sys/arm/annapurna/alpine/std.alpine
  projects/pnfs-planb-server/sys/arm/arm/disassem.c
  projects/pnfs-planb-server/sys/arm/arm/machdep.c
  projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c
  projects/pnfs-planb-server/sys/arm/broadcom/bcm2835/std.bcm2836
  projects/pnfs-planb-server/sys/arm/conf/ALLWINNER_UP
  projects/pnfs-planb-server/sys/arm/conf/ALPINE
  projects/pnfs-planb-server/sys/arm/conf/AML8726
  projects/pnfs-planb-server/sys/arm/conf/ARMADA38X
  projects/pnfs-planb-server/sys/arm/conf/ARMADAXP
  projects/pnfs-planb-server/sys/arm/conf/BEAGLEBONE
  projects/pnfs-planb-server/sys/arm/conf/EFIKA_MX
  projects/pnfs-planb-server/sys/arm/conf/EXYNOS5.common
  projects/pnfs-planb-server/sys/arm/conf/GENERIC
  projects/pnfs-planb-server/sys/arm/conf/IMX53
  projects/pnfs-planb-server/sys/arm/conf/IMX6
  projects/pnfs-planb-server/sys/arm/conf/PANDABOARD
  projects/pnfs-planb-server/sys/arm/conf/RK3188
  projects/pnfs-planb-server/sys/arm/conf/RPI2
  projects/pnfs-planb-server/sys/arm/conf/SOCFPGA
  projects/pnfs-planb-server/sys/arm/conf/TEGRA124
  projects/pnfs-planb-server/sys/arm/conf/VYBRID
  projects/pnfs-planb-server/sys/arm/conf/ZEDBOARD
  projects/pnfs-planb-server/sys/arm/conf/std.armv6
  projects/pnfs-planb-server/sys/arm/freescale/imx/imx6_hdmi.c
  projects/pnfs-planb-server/sys/arm/freescale/imx/std.imx51
  projects/pnfs-planb-server/sys/arm/freescale/imx/std.imx53
  projects/pnfs-planb-server/sys/arm/freescale/imx/std.imx6
  projects/pnfs-planb-server/sys/arm/freescale/vybrid/std.vybrid
  projects/pnfs-planb-server/sys/arm/include/machdep.h
  projects/pnfs-planb-server/sys/arm/include/param.h
  projects/pnfs-planb-server/sys/arm/include/sysarch.h
  projects/pnfs-planb-server/sys/arm/mv/armada38x/std.armada38x
  projects/pnfs-planb-server/sys/arm/mv/std-pj4b.mv
  projects/pnfs-planb-server/sys/arm/nvidia/tegra124/std.tegra124
  projects/pnfs-planb-server/sys/arm/qemu/std.virt
  projects/pnfs-planb-server/sys/arm/rockchip/std.rk30xx
  projects/pnfs-planb-server/sys/arm/samsung/exynos/std.exynos5250
  projects/pnfs-planb-server/sys/arm/samsung/exynos/std.exynos5420
  projects/pnfs-planb-server/sys/arm/ti/std.ti
  projects/pnfs-planb-server/sys/arm/xilinx/std.zynq7
  projects/pnfs-planb-server/sys/arm64/arm64/machdep.c
  projects/pnfs-planb-server/sys/arm64/arm64/pmap.c
  projects/pnfs-planb-server/sys/arm64/include/efi.h
  projects/pnfs-planb-server/sys/arm64/include/pte.h
  projects/pnfs-planb-server/sys/boot/Makefile
  projects/pnfs-planb-server/sys/boot/Makefile.amd64
  projects/pnfs-planb-server/sys/boot/Makefile.i386
  projects/pnfs-planb-server/sys/boot/Makefile.inc
  projects/pnfs-planb-server/sys/boot/Makefile.powerpc
  projects/pnfs-planb-server/sys/boot/arm/uboot/Makefile
  projects/pnfs-planb-server/sys/boot/arm/uboot/conf.c
  projects/pnfs-planb-server/sys/boot/efi/boot1/Makefile
  projects/pnfs-planb-server/sys/boot/efi/boot1/boot1.c
  projects/pnfs-planb-server/sys/boot/efi/fdt/Makefile
  projects/pnfs-planb-server/sys/boot/efi/include/efilib.h
  projects/pnfs-planb-server/sys/boot/efi/include/efizfs.h
  projects/pnfs-planb-server/sys/boot/efi/libefi/Makefile
  projects/pnfs-planb-server/sys/boot/efi/libefi/devpath.c
  projects/pnfs-planb-server/sys/boot/efi/libefi/efizfs.c
  projects/pnfs-planb-server/sys/boot/efi/loader/Makefile
  projects/pnfs-planb-server/sys/boot/efi/loader/arch/i386/exec.c
  projects/pnfs-planb-server/sys/boot/efi/loader/main.c
  projects/pnfs-planb-server/sys/boot/ficl/Makefile
  projects/pnfs-planb-server/sys/boot/i386/gptboot/Makefile
  projects/pnfs-planb-server/sys/boot/i386/gptzfsboot/Makefile
  projects/pnfs-planb-server/sys/boot/i386/libfirewire/Makefile
  projects/pnfs-planb-server/sys/boot/i386/libi386/Makefile
  projects/pnfs-planb-server/sys/boot/i386/loader/Makefile
  projects/pnfs-planb-server/sys/boot/i386/zfsboot/Makefile
  projects/pnfs-planb-server/sys/boot/mips/beri/boot2/Makefile
  projects/pnfs-planb-server/sys/boot/mips/beri/loader/Makefile
  projects/pnfs-planb-server/sys/boot/mips/uboot/Makefile
  projects/pnfs-planb-server/sys/boot/mips/uboot/conf.c
  projects/pnfs-planb-server/sys/boot/ofw/libofw/Makefile
  projects/pnfs-planb-server/sys/boot/powerpc/boot1.chrp/Makefile
  projects/pnfs-planb-server/sys/boot/powerpc/kboot/Makefile
  projects/pnfs-planb-server/sys/boot/powerpc/ofw/Makefile
  projects/pnfs-planb-server/sys/boot/powerpc/ofw/conf.c
  projects/pnfs-planb-server/sys/boot/powerpc/ps3/Makefile
  projects/pnfs-planb-server/sys/boot/powerpc/uboot/Makefile
  projects/pnfs-planb-server/sys/boot/powerpc/uboot/conf.c
  projects/pnfs-planb-server/sys/boot/sparc64/boot1/Makefile
  projects/pnfs-planb-server/sys/boot/sparc64/loader/Makefile
  projects/pnfs-planb-server/sys/boot/uboot/fdt/Makefile
  projects/pnfs-planb-server/sys/boot/uboot/lib/Makefile
  projects/pnfs-planb-server/sys/boot/userboot/Makefile
  projects/pnfs-planb-server/sys/boot/userboot/userboot/Makefile
  projects/pnfs-planb-server/sys/boot/userboot/zfs/Makefile
  projects/pnfs-planb-server/sys/boot/zfs/Makefile
  projects/pnfs-planb-server/sys/cam/ata/ata_da.c
  projects/pnfs-planb-server/sys/cam/nvme/nvme_da.c
  projects/pnfs-planb-server/sys/cam/scsi/scsi_da.c
  projects/pnfs-planb-server/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h
  projects/pnfs-planb-server/sys/compat/freebsd32/capabilities.conf
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_sysent.c
  projects/pnfs-planb-server/sys/compat/linsysfs/linsysfs.c
  projects/pnfs-planb-server/sys/compat/linux/linux_util.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_schedule.c
  projects/pnfs-planb-server/sys/compat/ndis/kern_ndis.c
  projects/pnfs-planb-server/sys/compat/ndis/ndis_var.h
  projects/pnfs-planb-server/sys/conf/Makefile.arm
  projects/pnfs-planb-server/sys/conf/files
  projects/pnfs-planb-server/sys/conf/files.arm
  projects/pnfs-planb-server/sys/conf/files.arm64
  projects/pnfs-planb-server/sys/conf/kern.mk
  projects/pnfs-planb-server/sys/conf/kern.opts.mk
  projects/pnfs-planb-server/sys/conf/kern.pre.mk
  projects/pnfs-planb-server/sys/conf/options.arm
  projects/pnfs-planb-server/sys/conf/options.arm64
  projects/pnfs-planb-server/sys/contrib/dev/acpica/changes.txt
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/adfile.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahtable.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtable.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asldebug.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslhelp.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslload.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmapenter.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmaputils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmethod.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslopt.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslparseop.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslprintf.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslsupport.l
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvcompiler.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvparser.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtexpress.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtio.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtparser.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtsubtable.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttable.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttable1.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttable2.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttemplate.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/prexpress.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/prmacros.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/prparser.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/prscan.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/prutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nssearch.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utinit.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utmath.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acapps.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acconfig.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acdisasm.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acexcep.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/aclocal.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acpixf.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl1.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl2.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actypes.h
  projects/pnfs-planb-server/sys/contrib/rdma/krping/krping.c
  projects/pnfs-planb-server/sys/dev/acpica/Osd/OsdSchedule.c
  projects/pnfs-planb-server/sys/dev/acpica/acpi_cpu.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath.c
  projects/pnfs-planb-server/sys/dev/cas/if_cas.c
  projects/pnfs-planb-server/sys/dev/cas/if_casvar.h
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt
  projects/pnfs-planb-server/sys/dev/cxgbe/t4_sge.c
  projects/pnfs-planb-server/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/pnfs-planb-server/sys/dev/dpaa/if_dtsec_rm.c
  projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_amd.h
  projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_core.c
  projects/pnfs-planb-server/sys/dev/hwpmc/hwpmc_intel.c
  projects/pnfs-planb-server/sys/dev/hwpmc/pmc_events.h
  projects/pnfs-planb-server/sys/dev/hyperv/include/hyperv.h
  projects/pnfs-planb-server/sys/dev/hyperv/netvsc/hn_nvs.c
  projects/pnfs-planb-server/sys/dev/hyperv/netvsc/hn_rndis.c
  projects/pnfs-planb-server/sys/dev/hyperv/netvsc/if_hn.c
  projects/pnfs-planb-server/sys/dev/hyperv/netvsc/if_hnvar.h
  projects/pnfs-planb-server/sys/dev/hyperv/netvsc/ndis.h
  projects/pnfs-planb-server/sys/dev/hyperv/vmbus/hyperv.c
  projects/pnfs-planb-server/sys/dev/hyperv/vmbus/vmbus.c
  projects/pnfs-planb-server/sys/dev/if_ndis/if_ndis.c
  projects/pnfs-planb-server/sys/dev/iscsi_initiator/isc_soc.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_8000.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_config.h
  projects/pnfs-planb-server/sys/dev/ixgbe/if_ix.c
  projects/pnfs-planb-server/sys/dev/ixgbe/if_ixv.c
  projects/pnfs-planb-server/sys/dev/ixgbe/ixgbe_rss.h
  projects/pnfs-planb-server/sys/dev/lge/if_lge.c
  projects/pnfs-planb-server/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c
  projects/pnfs-planb-server/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
  projects/pnfs-planb-server/sys/dev/mwl/if_mwl.c
  projects/pnfs-planb-server/sys/dev/netmap/netmap_generic.c
  projects/pnfs-planb-server/sys/dev/nvme/nvme.h
  projects/pnfs-planb-server/sys/dev/nvme/nvme_ctrlr.c
  projects/pnfs-planb-server/sys/dev/nvme/nvme_private.h
  projects/pnfs-planb-server/sys/dev/nvme/nvme_sim.c
  projects/pnfs-planb-server/sys/dev/pccbb/pccbb_isa.c
  projects/pnfs-planb-server/sys/dev/pci/pci.c
  projects/pnfs-planb-server/sys/dev/psci/psci.c
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_def.h
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_glbl.h
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_hw.c
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_hw.h
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_ioctl.c
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_ioctl.h
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_os.c
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_ver.h
  projects/pnfs-planb-server/sys/dev/random/fortuna.c
  projects/pnfs-planb-server/sys/dev/random/random_harvestq.c
  projects/pnfs-planb-server/sys/dev/random/randomdev.c
  projects/pnfs-planb-server/sys/dev/sound/pci/hda/hdac.c
  projects/pnfs-planb-server/sys/dev/sound/pci/hda/hdac.h
  projects/pnfs-planb-server/sys/dev/uart/uart_dev_ns8250.c
  projects/pnfs-planb-server/sys/dev/usb/serial/u3g.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_audio.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_kbd.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_midi.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_modem.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_mouse.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_phone.c
  projects/pnfs-planb-server/sys/dev/usb/template/usb_template_serialnet.c
  projects/pnfs-planb-server/sys/dev/usb/usbdevs
  projects/pnfs-planb-server/sys/dev/wb/if_wb.c
  projects/pnfs-planb-server/sys/fs/fuse/fuse_ipc.c
  projects/pnfs-planb-server/sys/fs/fuse/fuse_vnops.c
  projects/pnfs-planb-server/sys/fs/nfs/nfs_commonkrpc.c
  projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c
  projects/pnfs-planb-server/sys/fs/nfs/nfsclstate.h
  projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/pnfs-planb-server/sys/fs/tmpfs/tmpfs_subr.c
  projects/pnfs-planb-server/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/pnfs-planb-server/sys/i386/i386/machdep.c
  projects/pnfs-planb-server/sys/i386/i386/swtch.s
  projects/pnfs-planb-server/sys/i386/i386/sys_machdep.c
  projects/pnfs-planb-server/sys/i386/include/md_var.h
  projects/pnfs-planb-server/sys/kern/capabilities.conf
  projects/pnfs-planb-server/sys/kern/init_sysent.c
  projects/pnfs-planb-server/sys/kern/kern_mbuf.c
  projects/pnfs-planb-server/sys/kern/kern_mutex.c
  projects/pnfs-planb-server/sys/kern/kern_proc.c
  projects/pnfs-planb-server/sys/kern/kern_sendfile.c
  projects/pnfs-planb-server/sys/kern/kern_sig.c
  projects/pnfs-planb-server/sys/kern/kern_tc.c
  projects/pnfs-planb-server/sys/kern/subr_blist.c
  projects/pnfs-planb-server/sys/kern/subr_bus.c
  projects/pnfs-planb-server/sys/kern/subr_eventhandler.c
  projects/pnfs-planb-server/sys/kern/subr_mbpool.c
  projects/pnfs-planb-server/sys/kern/subr_sleepqueue.c
  projects/pnfs-planb-server/sys/kern/subr_stack.c
  projects/pnfs-planb-server/sys/kern/subr_unit.c
  projects/pnfs-planb-server/sys/kern/uipc_mbuf.c
  projects/pnfs-planb-server/sys/kern/vfs_cache.c
  projects/pnfs-planb-server/sys/kern/vfs_export.c
  projects/pnfs-planb-server/sys/kern/vfs_lookup.c
  projects/pnfs-planb-server/sys/kern/vfs_mount.c
  projects/pnfs-planb-server/sys/kern/vfs_syscalls.c
  projects/pnfs-planb-server/sys/modules/Makefile
  projects/pnfs-planb-server/sys/modules/cloudabi32/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/t4_firmware/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/t5_firmware/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/t6_firmware/Makefile
  projects/pnfs-planb-server/sys/modules/em/Makefile
  projects/pnfs-planb-server/sys/modules/iwmfw/Makefile
  projects/pnfs-planb-server/sys/net/if_clone.c
  projects/pnfs-planb-server/sys/net/rss_config.c
  projects/pnfs-planb-server/sys/net/rss_config.h
  projects/pnfs-planb-server/sys/net80211/ieee80211_input.h
  projects/pnfs-planb-server/sys/net80211/ieee80211_ioctl.h
  projects/pnfs-planb-server/sys/netinet/sctp_constants.h
  projects/pnfs-planb-server/sys/netinet/sctp_indata.c
  projects/pnfs-planb-server/sys/netinet/sctp_input.c
  projects/pnfs-planb-server/sys/netinet/sctp_output.c
  projects/pnfs-planb-server/sys/netinet/sctputil.c
  projects/pnfs-planb-server/sys/netinet/sctputil.h
  projects/pnfs-planb-server/sys/netinet/tcp_input.c
  projects/pnfs-planb-server/sys/netinet/tcp_output.c
  projects/pnfs-planb-server/sys/netinet/tcp_sack.c
  projects/pnfs-planb-server/sys/netinet/tcp_stacks/fastpath.c
  projects/pnfs-planb-server/sys/netinet/tcp_timer.c
  projects/pnfs-planb-server/sys/netinet/tcp_timer.h
  projects/pnfs-planb-server/sys/netinet/tcp_var.h
  projects/pnfs-planb-server/sys/netpfil/ipfw/ip_fw2.c
  projects/pnfs-planb-server/sys/ofed/include/rdma/ib_addr.h
  projects/pnfs-planb-server/sys/opencrypto/crypto.c
  projects/pnfs-planb-server/sys/sparc64/sparc64/stack_machdep.c
  projects/pnfs-planb-server/sys/sys/blist.h
  projects/pnfs-planb-server/sys/sys/eventhandler.h
  projects/pnfs-planb-server/sys/sys/mbpool.h
  projects/pnfs-planb-server/sys/sys/mbuf.h
  projects/pnfs-planb-server/sys/sys/mutex.h
  projects/pnfs-planb-server/sys/sys/param.h
  projects/pnfs-planb-server/sys/sys/random.h
  projects/pnfs-planb-server/sys/sys/stack.h
  projects/pnfs-planb-server/sys/sys/systm.h
  projects/pnfs-planb-server/sys/sys/vmmeter.h
  projects/pnfs-planb-server/sys/vm/swap_pager.c
  projects/pnfs-planb-server/sys/vm/vm_kern.c
  projects/pnfs-planb-server/sys/vm/vm_page.c
  projects/pnfs-planb-server/sys/vm/vm_phys.h
Directory Properties:
  projects/pnfs-planb-server/sys/   (props changed)
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/   (props changed)
  projects/pnfs-planb-server/sys/contrib/dev/acpica/   (props changed)

Modified: projects/pnfs-planb-server/sys/amd64/amd64/pmap.c
==============================================================================

--- projects/pnfs-planb-server/sys/amd64/amd64/pmap.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/amd64/amd64/pmap.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -2888,11 +2888,11 @@ reclaim_pv_chunk_leave_pmap(pmap_t pmap, pmap_t locked
 static vm_page_t
 reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **lockp)
 {
-	struct pch new_tail;
-	struct pv_chunk *pc;
+	struct pv_chunk *pc, *pc_marker;
+	struct pv_chunk_header pc_marker_b;
 	struct md_page *pvh;
 	pd_entry_t *pde;
-	pmap_t pmap;
+	pmap_t next_pmap, pmap;
 	pt_entry_t *pte, tpte;
 	pt_entry_t PG_G, PG_A, PG_M, PG_RW;
 	pv_entry_t pv;
@@ -2909,7 +2909,8 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l
 	m_pc = NULL;
 	PG_G = PG_A = PG_M = PG_RW = 0;
 	SLIST_INIT(&free);
-	TAILQ_INIT(&new_tail);
+	bzero(&pc_marker_b, sizeof(pc_marker_b));
+	pc_marker = (struct pv_chunk *)&pc_marker_b;
 
 	/*
 	 * A delayed invalidation block should already be active if
@@ -2919,30 +2920,52 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l
 	start_di = pmap_not_in_di();
 
 	mtx_lock(&pv_chunks_mutex);
-	while ((pc = TAILQ_FIRST(&pv_chunks)) != NULL && SLIST_EMPTY(&free)) {
-		TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
+	TAILQ_INSERT_HEAD(&pv_chunks, pc_marker, pc_lru);
+	while ((pc = TAILQ_NEXT(pc_marker, pc_lru)) != NULL &&
+	    SLIST_EMPTY(&free)) {
+		next_pmap = pc->pc_pmap;
+		if (next_pmap == NULL)		/* marker */
+			goto next_chunk;
 		mtx_unlock(&pv_chunks_mutex);
-		if (pmap != pc->pc_pmap) {
+
+		/*
+		 * A pv_chunk can only be removed from the pc_lru list
+		 * when both pc_chunks_mutex is owned and the
+		 * corresponding pmap is locked.
+		 */
+		if (pmap != next_pmap) {
 			reclaim_pv_chunk_leave_pmap(pmap, locked_pmap,
 			    start_di);
-			pmap = pc->pc_pmap;
+			pmap = next_pmap;
 			/* Avoid deadlock and lock recursion. */
 			if (pmap > locked_pmap) {
 				RELEASE_PV_LIST_LOCK(lockp);
 				PMAP_LOCK(pmap);
-			} else if (pmap != locked_pmap &&
-			    !PMAP_TRYLOCK(pmap)) {
-				pmap = NULL;
-				TAILQ_INSERT_TAIL(&new_tail, pc, pc_lru);
+				if (start_di)
+					pmap_delayed_invl_started();
 				mtx_lock(&pv_chunks_mutex);
 				continue;
-			}
+			} else if (pmap != locked_pmap) {
+				if (PMAP_TRYLOCK(pmap)) {
+					if (start_di)
+						pmap_delayed_invl_started();
+					mtx_lock(&pv_chunks_mutex);
+					continue;
+				} else {
+					pmap = NULL; /* pmap is not locked */
+					mtx_lock(&pv_chunks_mutex);
+					pc = TAILQ_NEXT(pc_marker, pc_lru);
+					if (pc == NULL ||
+					    pc->pc_pmap != next_pmap)
+						continue;
+					goto next_chunk;
+				}
+			} else if (start_di)
+				pmap_delayed_invl_started();
 			PG_G = pmap_global_bit(pmap);
 			PG_A = pmap_accessed_bit(pmap);
 			PG_M = pmap_modified_bit(pmap);
 			PG_RW = pmap_rw_bit(pmap);
-			if (start_di)
-				pmap_delayed_invl_started();
 		}
 
 		/*
@@ -2987,9 +3010,8 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l
 			}
 		}
 		if (freed == 0) {
-			TAILQ_INSERT_TAIL(&new_tail, pc, pc_lru);
 			mtx_lock(&pv_chunks_mutex);
-			continue;
+			goto next_chunk;
 		}
 		/* Every freed mapping is for a 4 KB page. */
 		pmap_resident_count_dec(pmap, freed);
@@ -3006,16 +3028,19 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **l
 			m_pc = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
 			dump_drop_page(m_pc->phys_addr);
 			mtx_lock(&pv_chunks_mutex);
+			TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
 			break;
 		}
 		TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list);
-		TAILQ_INSERT_TAIL(&new_tail, pc, pc_lru);
 		mtx_lock(&pv_chunks_mutex);
 		/* One freed pv entry in locked_pmap is sufficient. */
 		if (pmap == locked_pmap)
 			break;
+next_chunk:
+		TAILQ_REMOVE(&pv_chunks, pc_marker, pc_lru);
+		TAILQ_INSERT_AFTER(&pv_chunks, pc, pc_marker, pc_lru);
 	}
-	TAILQ_CONCAT(&pv_chunks, &new_tail, pc_lru);
+	TAILQ_REMOVE(&pv_chunks, pc_marker, pc_lru);
 	mtx_unlock(&pv_chunks_mutex);
 	reclaim_pv_chunk_leave_pmap(pmap, locked_pmap, start_di);
 	if (m_pc == NULL && !SLIST_EMPTY(&free)) {

Modified: projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -556,12 +556,12 @@ amd64_get_ldt(struct thread *td, struct i386_ldt_args 
 	    uap->start, uap->num, (void *)uap->descs);
 #endif
 
-	if (uap->start >= max_ldt_segment)
-		return (EINVAL);
-	num = min(uap->num, max_ldt_segment - uap->start);
 	pldt = td->td_proc->p_md.md_ldt;
-	if (pldt == NULL)
-		return (EINVAL);
+	if (pldt == NULL || uap->start >= max_ldt_segment || uap->num == 0) {
+		td->td_retval[0] = 0;
+		return (0);
+	}
+	num = min(uap->num, max_ldt_segment - uap->start);
 	lp = &((struct user_segment_descriptor *)(pldt->ldt_base))[uap->start];
 	data = malloc(num * sizeof(struct user_segment_descriptor), M_TEMP,
 	    M_WAITOK);

Modified: projects/pnfs-planb-server/sys/amd64/include/pmap.h
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/include/pmap.h	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/amd64/include/pmap.h	Mon Oct 16 23:40:24 2017	(r324677)
@@ -366,11 +366,18 @@ typedef struct pv_entry {
  */
 #define	_NPCM	3
 #define	_NPCPV	168
-struct pv_chunk {
-	pmap_t			pc_pmap;
-	TAILQ_ENTRY(pv_chunk)	pc_list;
-	uint64_t		pc_map[_NPCM];	/* bitmap; 1 = free */
+#define	PV_CHUNK_HEADER							\
+	pmap_t			pc_pmap;				\
+	TAILQ_ENTRY(pv_chunk)	pc_list;				\
+	uint64_t		pc_map[_NPCM];	/* bitmap; 1 = free */	\
 	TAILQ_ENTRY(pv_chunk)	pc_lru;
+
+struct pv_chunk_header {
+	PV_CHUNK_HEADER
+};
+
+struct pv_chunk {
+	PV_CHUNK_HEADER
 	struct pv_entry		pc_pventry[_NPCPV];
 };
 

Modified: projects/pnfs-planb-server/sys/arm/allwinner/a10_ehci.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/allwinner/a10_ehci.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/allwinner/a10_ehci.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -65,17 +65,10 @@ __FBSDID("$FreeBSD$");
 
 #define EHCI_HC_DEVSTR			"Allwinner Integrated USB 2.0 controller"
 
-#define SW_USB_PMU_IRQ_ENABLE		0x800
-
 #define SW_SDRAM_REG_HPCR_USB1		(0x250 + ((1 << 2) * 4))
 #define SW_SDRAM_REG_HPCR_USB2		(0x250 + ((1 << 2) * 5))
 #define SW_SDRAM_BP_HPCR_ACCESS		(1 << 0)
 
-#define SW_ULPI_BYPASS			(1 << 0)
-#define SW_AHB_INCRX_ALIGN		(1 << 8)
-#define SW_AHB_INCR4			(1 << 9)
-#define SW_AHB_INCR8			(1 << 10)
-
 #define	USB_CONF(d)			\
 	(void *)ofw_bus_search_compatible((d), compat_data)->ocd_data
 
@@ -124,7 +117,7 @@ static struct ofw_compat_data compat_data[] = {
 	{ "allwinner,sun7i-a20-ehci",	(uintptr_t)&a10_ehci_conf },
 	{ "allwinner,sun8i-a83t-ehci",	(uintptr_t)&a31_ehci_conf },
 	{ "allwinner,sun8i-h3-ehci",	(uintptr_t)&a31_ehci_conf },
-	/* { "allwinner,sun50i-a64-ehci",	(uintptr_t)&a31_ehci_conf }, */
+	{ "allwinner,sun50i-a64-ehci",	(uintptr_t)&a31_ehci_conf },
 	{ NULL,				(uintptr_t)NULL }
 };
 
@@ -254,14 +247,6 @@ a10_ehci_attach(device_t self)
 		}
 	}
 
-	/* Enable passby */
-	reg_value = A10_READ_4(sc, SW_USB_PMU_IRQ_ENABLE);
-	reg_value |= SW_AHB_INCR8; /* AHB INCR8 enable */
-	reg_value |= SW_AHB_INCR4; /* AHB burst type INCR4 enable */
-	reg_value |= SW_AHB_INCRX_ALIGN; /* AHB INCRX align enable */
-	reg_value |= SW_ULPI_BYPASS; /* ULPI bypass enable */
-	A10_WRITE_4(sc, SW_USB_PMU_IRQ_ENABLE, reg_value);
-
 	/* Configure port */
 	if (conf->sdram_init) {
 		reg_value = A10_READ_4(sc, SW_SDRAM_REG_HPCR_USB2);
@@ -332,14 +317,6 @@ a10_ehci_detach(device_t self)
 		reg_value &= ~SW_SDRAM_BP_HPCR_ACCESS;
 		A10_WRITE_4(sc, SW_SDRAM_REG_HPCR_USB2, reg_value);
 	}
-
-	/* Disable passby */
-	reg_value = A10_READ_4(sc, SW_USB_PMU_IRQ_ENABLE);
-	reg_value &= ~SW_AHB_INCR8; /* AHB INCR8 disable */
-	reg_value &= ~SW_AHB_INCR4; /* AHB burst type INCR4 disable */
-	reg_value &= ~SW_AHB_INCRX_ALIGN; /* AHB INCRX align disable */
-	reg_value &= ~SW_ULPI_BYPASS; /* ULPI bypass disable */
-	A10_WRITE_4(sc, SW_USB_PMU_IRQ_ENABLE, reg_value);
 
 	/* Disable clock */
 	TAILQ_FOREACH_SAFE(clk, &aw_sc->clk_list, next, clk_tmp) {

Modified: projects/pnfs-planb-server/sys/arm/allwinner/clkng/aw_ccung.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/allwinner/clkng/aw_ccung.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/allwinner/clkng/aw_ccung.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -64,10 +64,12 @@ __FBSDID("$FreeBSD$");
 
 #if defined(SOC_ALLWINNER_A64)
 #include <arm/allwinner/clkng/ccu_a64.h>
+#include <arm/allwinner/clkng/ccu_sun8i_r.h>
 #endif
 
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 #include <arm/allwinner/clkng/ccu_h3.h>
+#include <arm/allwinner/clkng/ccu_sun8i_r.h>
 #endif
 
 #include "clkdev_if.h"
@@ -79,26 +81,30 @@ static struct resource_spec aw_ccung_spec[] = {
 };
 
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
-#define	H3_CCU	1
+#define	H3_CCU		1
+#define	H3_R_CCU	2
 #endif
 
 #if defined(SOC_ALLWINNER_A31)
-#define	A31_CCU	2
+#define	A31_CCU		3
 #endif
 
 #if defined(SOC_ALLWINNER_A64)
-#define	A64_CCU	2
+#define	A64_CCU		4
+#define	A64_R_CCU	5
 #endif
 
 static struct ofw_compat_data compat_data[] = {
 #if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 	{ "allwinner,sun8i-h3-ccu", H3_CCU },
+	{ "allwinner,sun8i-h3-r-ccu", H3_R_CCU },
 #endif
 #if defined(SOC_ALLWINNER_A31)
 	{ "allwinner,sun6i-a31-ccu", A31_CCU },
 #endif
 #if defined(SOC_ALLWINNER_A64)
 	{ "allwinner,sun50i-a64-ccu", A64_CCU },
+	{ "allwinner,sun50i-a64-r-ccu", A64_R_CCU },
 #endif
 	{NULL, 0 }
 };
@@ -320,6 +326,9 @@ aw_ccung_attach(device_t dev)
 	case H3_CCU:
 		ccu_h3_register_clocks(sc);
 		break;
+	case H3_R_CCU:
+		ccu_sun8i_r_register_clocks(sc);
+		break;
 #endif
 #if defined(SOC_ALLWINNER_A31)
 	case A31_CCU:
@@ -329,6 +338,9 @@ aw_ccung_attach(device_t dev)
 #if defined(SOC_ALLWINNER_A64)
 	case A64_CCU:
 		ccu_a64_register_clocks(sc);
+		break;
+	case A64_R_CCU:
+		ccu_sun8i_r_register_clocks(sc);
 		break;
 #endif
 	}

Copied: projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_sun8i_r.c (from r324676, head/sys/arm/allwinner/clkng/ccu_sun8i_r.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_sun8i_r.c	Mon Oct 16 23:40:24 2017	(r324677, copy of r324676, head/sys/arm/allwinner/clkng/ccu_sun8i_r.c)
@@ -0,0 +1,127 @@
+/*-
+ * Copyright (c) 2017 Emmanuel Vadot <manu at freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <dev/extres/clk/clk_div.h>
+#include <dev/extres/clk/clk_fixed.h>
+#include <dev/extres/clk/clk_mux.h>
+
+#include <arm/allwinner/clkng/aw_ccung.h>
+#include <arm/allwinner/clkng/aw_clk.h>
+#include <arm/allwinner/clkng/aw_clk_nm.h>
+#include <arm/allwinner/clkng/aw_clk_nkmp.h>
+#include <arm/allwinner/clkng/aw_clk_prediv_mux.h>
+
+#include <arm/allwinner/clkng/ccu_sun8i_r.h>
+
+#include <gnu/dts/include/dt-bindings/clock/sun8i-r-ccu.h>
+#include <gnu/dts/include/dt-bindings/reset/sun8i-r-ccu.h>
+
+/* Non-exported clocks */
+#define	CLK_AHB0	1
+#define	CLK_APB0	2
+
+static struct aw_ccung_reset ccu_sun8i_r_resets[] = {
+	CCU_RESET(RST_APB0_IR, 0xb0, 1)
+	CCU_RESET(RST_APB0_TIMER, 0xb0, 2)
+	CCU_RESET(RST_APB0_RSB, 0xb0, 4)
+	CCU_RESET(RST_APB0_UART, 0xb0, 6)
+};
+
+static struct aw_ccung_gate ccu_sun8i_r_gates[] = {
+	CCU_GATE(CLK_APB0_PIO, "apb0-pio", "apb0", 0x28, 0)
+	CCU_GATE(CLK_APB0_IR, "apb0-ir", "apb0", 0x28, 1)
+	CCU_GATE(CLK_APB0_TIMER, "apb0-timer", "apb0", 0x28, 2)
+	CCU_GATE(CLK_APB0_RSB, "apb0-rsb", "apb0", 0x28, 3)
+	CCU_GATE(CLK_APB0_UART, "apb0-uart", "apb0", 0x28, 4)
+	CCU_GATE(CLK_APB0_I2C, "apb0-i2c", "apb0", 0x28, 6)
+	CCU_GATE(CLK_APB0_TWD, "apb0-twd", "apb0", 0x28, 7)
+};
+
+static const char *ar100_parents[] = {"osc32k", "osc24M", "pll_periph0", "iosc"};
+PREDIV_CLK(ar100_clk, CLK_AR100,				/* id */
+    "ar100", ar100_parents,					/* name, parents */
+    0x00,							/* offset */
+    16, 2,							/* mux */
+    4, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO,			/* div */
+    8, 5, 0, AW_CLK_FACTOR_HAS_COND,				/* prediv */
+    16, 2, 2);							/* prediv condition */
+
+static const char *ahb0_parents[] = {"ar100"};
+FIXED_CLK(ahb0_clk,
+    CLK_AHB0,			/* id */
+    "ahb0",			/* name */
+    ahb0_parents,		/* parent */
+    0,				/* freq */
+    1,				/* mult */
+    1,				/* div */
+    0);				/* flags */
+
+static const char *apb0_parents[] = {"ahb0"};
+DIV_CLK(apb0_clk,
+    CLK_APB0,			/* id */
+    "apb0", apb0_parents,	/* name, parents */
+    0x0c,			/* offset */
+    0, 2,			/* shift, width */
+    0, NULL);			/* flags, div table */
+
+static struct aw_clk_prediv_mux_def *prediv_mux_clks[] = {
+	&ar100_clk,
+};
+
+static struct clk_div_def *div_clks[] = {
+	&apb0_clk,
+};
+
+static struct clk_fixed_def *fixed_factor_clks[] = {
+	&ahb0_clk,
+};
+
+void
+ccu_sun8i_r_register_clocks(struct aw_ccung_softc *sc)
+{
+	int i;
+
+	sc->resets = ccu_sun8i_r_resets;
+	sc->nresets = nitems(ccu_sun8i_r_resets);
+	sc->gates = ccu_sun8i_r_gates;
+	sc->ngates = nitems(ccu_sun8i_r_gates);
+
+	for (i = 0; i < nitems(prediv_mux_clks); i++)
+		aw_clk_prediv_mux_register(sc->clkdom, prediv_mux_clks[i]);
+	for (i = 0; i < nitems(div_clks); i++)
+		clknode_div_register(sc->clkdom, div_clks[i]);
+	for (i = 0; i < nitems(fixed_factor_clks); i++)
+		clknode_fixed_register(sc->clkdom, fixed_factor_clks[i]);
+}

Copied: projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_sun8i_r.h (from r324676, head/sys/arm/allwinner/clkng/ccu_sun8i_r.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/pnfs-planb-server/sys/arm/allwinner/clkng/ccu_sun8i_r.h	Mon Oct 16 23:40:24 2017	(r324677, copy of r324676, head/sys/arm/allwinner/clkng/ccu_sun8i_r.h)
@@ -0,0 +1,34 @@
+/*-
+ * Copyright (c) 2017 Emmanuel Vadot <manu at freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	__CCU_SUN8I_R_H__
+#define __CCU_SUN8I_R_H__
+
+void	ccu_sun8i_r_register_clocks(struct aw_ccung_softc *sc);
+
+#endif /* __CCU_SUN8I_R_H__ */

Modified: projects/pnfs-planb-server/sys/arm/allwinner/h3/files.h3
==============================================================================
--- projects/pnfs-planb-server/sys/arm/allwinner/h3/files.h3	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/allwinner/h3/files.h3	Mon Oct 16 23:40:24 2017	(r324677)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 arm/allwinner/clkng/ccu_h3.c		standard
+arm/allwinner/clkng/ccu_sun8i_r.c	standard
 arm/allwinner/h3/h3_padconf.c		standard
 arm/allwinner/h3/h3_r_padconf.c		standard

Modified: projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner
==============================================================================
--- projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner	Mon Oct 16 23:40:24 2017	(r324677)
@@ -2,7 +2,7 @@
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0200000

Modified: projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner_up
==============================================================================
--- projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner_up	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/allwinner/std.allwinner_up	Mon Oct 16 23:40:24 2017	(r324677)
@@ -2,7 +2,7 @@
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0200000

Modified: projects/pnfs-planb-server/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- projects/pnfs-planb-server/sys/arm/altera/socfpga/std.socfpga	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/altera/socfpga/std.socfpga	Mon Oct 16 23:40:24 2017	(r324677)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0f00000

Modified: projects/pnfs-planb-server/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- projects/pnfs-planb-server/sys/arm/amlogic/aml8726/std.aml8726	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/amlogic/aml8726/std.aml8726	Mon Oct 16 23:40:24 2017	(r324677)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine		arm armv6
+machine		arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 # Physical memory starts at 0x80000000.  We assume the kernel is loaded

Modified: projects/pnfs-planb-server/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- projects/pnfs-planb-server/sys/arm/annapurna/alpine/std.alpine	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/annapurna/alpine/std.alpine	Mon Oct 16 23:40:24 2017	(r324677)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
 
 makeoptions	KERNVIRTADDR=0xa0200000

Modified: projects/pnfs-planb-server/sys/arm/arm/disassem.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/disassem.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/arm/disassem.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -131,6 +131,7 @@ static const struct arm32_insn arm32_i[] = {
     { 0x0c500000, 0x04400000, "strb",	"daW" },
     { 0x0c500000, 0x04500000, "ldrb",	"daW" },
 #if __ARM_ARCH >= 6
+    { 0x0fff0ff0, 0x06bf0fb0, "rev16",  "dm" },
     { 0xffffffff, 0xf57ff01f, "clrex",	"c" },
     { 0x0ff00ff0, 0x01800f90, "strex",	"dmo" },
     { 0x0ff00fff, 0x01900f9f, "ldrex",	"do" },

Modified: projects/pnfs-planb-server/sys/arm/arm/machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/machdep.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/arm/machdep.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -443,6 +443,30 @@ set_vfpcontext(struct thread *td, mcontext_vfp_t *vfp)
 }
 #endif
 
+int
+arm_get_vfpstate(struct thread *td, void *args)
+{
+	int rv;
+	struct arm_get_vfpstate_args ua;
+	mcontext_vfp_t	mcontext_vfp;
+
+	rv = copyin(args, &ua, sizeof(ua));
+	if (rv != 0)
+		return (rv);
+	if (ua.mc_vfp_size != sizeof(mcontext_vfp_t))
+		return (EINVAL);
+#ifdef VFP
+	get_vfpcontext(td, &mcontext_vfp);
+#else
+	bzero(&mcontext_vfp, sizeof(mcontext_vfp));
+#endif
+
+	rv = copyout(&mcontext_vfp, ua.mc_vfp,  sizeof(mcontext_vfp));
+	if (rv != 0)
+		return (rv);
+	return (0);
+}
+
 /*
  * Get machine context.
  */

Modified: projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpu.h>
 #include <machine/sysarch.h>
+#include <machine/machdep.h>
 #include <machine/vmparam.h>
 
 #ifndef _SYS_SYSPROTO_H_
@@ -204,6 +205,7 @@ sysarch(struct thread *td, struct sysarch_args *uap)
 		case ARM_DRAIN_WRITEBUF:
 		case ARM_SET_TP:
 		case ARM_GET_TP:
+		case ARM_GET_VFPSTATE:
 			break;
 
 		default:
@@ -228,6 +230,9 @@ sysarch(struct thread *td, struct sysarch_args *uap)
 		break;
 	case ARM_GET_TP:
 		error = arm32_get_tp(td, uap->parms);
+		break;
+	case ARM_GET_VFPSTATE:
+		error = arm_get_vfpstate(td, uap->parms);
 		break;
 	default:
 		error = EINVAL;

Modified: projects/pnfs-planb-server/sys/arm/broadcom/bcm2835/std.bcm2836
==============================================================================
--- projects/pnfs-planb-server/sys/arm/broadcom/bcm2835/std.bcm2836	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/broadcom/bcm2835/std.bcm2836	Mon Oct 16 23:40:24 2017	(r324677)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-machine 	arm armv6
+machine 	arm armv7
 cpu		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
 options 	SOC_BCM2836

Modified: projects/pnfs-planb-server/sys/arm/conf/ALLWINNER_UP
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/ALLWINNER_UP	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/ALLWINNER_UP	Mon Oct 16 23:40:24 2017	(r324677)
@@ -20,7 +20,7 @@
 
 ident		ALLWINNER_UP
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../allwinner/std.allwinner_up"
 
 options 	INTRNG

Modified: projects/pnfs-planb-server/sys/arm/conf/ALPINE
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/ALPINE	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/ALPINE	Mon Oct 16 23:40:24 2017	(r324677)
@@ -19,7 +19,7 @@
 
 ident		ALPINE
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../annapurna/alpine/std.alpine"
 
 makeoptions	MODULES_OVERRIDE=""

Modified: projects/pnfs-planb-server/sys/arm/conf/AML8726
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/AML8726	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/AML8726	Mon Oct 16 23:40:24 2017	(r324677)
@@ -23,7 +23,7 @@
 
 ident		AML8726
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../amlogic/aml8726/std.aml8726"
 
 options 	SCHED_ULE		# ULE scheduler

Modified: projects/pnfs-planb-server/sys/arm/conf/ARMADA38X
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/ARMADA38X	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/ARMADA38X	Mon Oct 16 23:40:24 2017	(r324677)
@@ -5,7 +5,7 @@
 #
 
 include 	"../mv/armada38x/std.armada38x"
-include 	"std.armv6"
+include 	"std.armv7"
 
 ident 	ARMADA38X
 

Modified: projects/pnfs-planb-server/sys/arm/conf/ARMADAXP
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/ARMADAXP	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/ARMADAXP	Mon Oct 16 23:40:24 2017	(r324677)
@@ -23,7 +23,7 @@
 
 ident		MV-88F78XX0
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../mv/armadaxp/std.mv78x60"
 
 options 	SOC_MV_ARMADAXP

Modified: projects/pnfs-planb-server/sys/arm/conf/BEAGLEBONE
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/BEAGLEBONE	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/BEAGLEBONE	Mon Oct 16 23:40:24 2017	(r324677)
@@ -23,7 +23,7 @@
 
 ident		BEAGLEBONE
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../ti/am335x/std.am335x"
 
 makeoptions	MODULES_EXTRA="dtb/am335x am335x_dmtpps"

Modified: projects/pnfs-planb-server/sys/arm/conf/EFIKA_MX
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/EFIKA_MX	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/EFIKA_MX	Mon Oct 16 23:40:24 2017	(r324677)
@@ -20,7 +20,7 @@
 
 ident		EFIKA_MX
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/imx/std.imx51"
 
 makeoptions	WITHOUT_MODULES="ahc"

Modified: projects/pnfs-planb-server/sys/arm/conf/EXYNOS5.common
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/EXYNOS5.common	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/EXYNOS5.common	Mon Oct 16 23:40:24 2017	(r324677)
@@ -20,7 +20,7 @@
 
 makeoptions	WERROR="-Werror"
 
-include 	"std.armv6"
+include 	"std.armv7"
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM		# Platform based SoC
 options 	PREEMPTION		# Enable kernel thread preemption

Modified: projects/pnfs-planb-server/sys/arm/conf/GENERIC
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/GENERIC	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/GENERIC	Mon Oct 16 23:40:24 2017	(r324677)
@@ -22,13 +22,13 @@ ident		GENERIC
 
 cpu		CPU_CORTEXA
 options 	SMP_ON_UP
-machine 	arm armv6
+machine 	arm armv7
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 makeoptions	KERNVIRTADDR=0xc0000000
 options 	KERNVIRTADDR=0xc0000000
 
-include 	"std.armv6"
+include 	"std.armv7"
 files		"../allwinner/files.allwinner"
 files		"../allwinner/files.allwinner_up"
 files		"../allwinner/a10/files.a10"
@@ -99,6 +99,7 @@ device		ahci			# AHCI-compatible SATA controllers
 # PCI
 options 	NEW_PCIB
 device		pci
+device		pci_host_generic
 
 # PCI NICs
 device		re			# RealTek 8139C+/8169/8169S/8110S
@@ -106,6 +107,7 @@ device		re			# RealTek 8139C+/8169/8169S/8110S
 # VirtIO
 device		virtio
 device		virtio_mmio
+device		virtio_pci
 device		virtio_blk
 device		vtnet
 

Modified: projects/pnfs-planb-server/sys/arm/conf/IMX53
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/IMX53	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/IMX53	Mon Oct 16 23:40:24 2017	(r324677)
@@ -20,7 +20,7 @@
 
 ident		IMX53
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/imx/std.imx53"
 
 options 	SOC_IMX53

Modified: projects/pnfs-planb-server/sys/arm/conf/IMX6
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/IMX6	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/IMX6	Mon Oct 16 23:40:24 2017	(r324677)
@@ -19,7 +19,7 @@
 # $FreeBSD$
 
 ident		IMX6
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/imx/std.imx6"
 
 options 	INTRNG

Modified: projects/pnfs-planb-server/sys/arm/conf/PANDABOARD
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/PANDABOARD	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/PANDABOARD	Mon Oct 16 23:40:24 2017	(r324677)
@@ -27,7 +27,7 @@ ident		PANDABOARD
 
 hints		"PANDABOARD.hints"
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../ti/omap4/std.omap4"
 
 makeoptions	MODULES_EXTRA=dtb/omap4

Modified: projects/pnfs-planb-server/sys/arm/conf/RK3188
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/RK3188	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/RK3188	Mon Oct 16 23:40:24 2017	(r324677)
@@ -20,7 +20,7 @@
 
 ident		RK3188
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../rockchip/std.rk30xx"
 
 options 	SOC_ROCKCHIP_RK3188

Modified: projects/pnfs-planb-server/sys/arm/conf/RPI2
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/RPI2	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/RPI2	Mon Oct 16 23:40:24 2017	(r324677)
@@ -22,7 +22,7 @@
 
 ident		RPI2
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2836"
 

Modified: projects/pnfs-planb-server/sys/arm/conf/SOCFPGA
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/SOCFPGA	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/SOCFPGA	Mon Oct 16 23:40:24 2017	(r324677)
@@ -19,7 +19,7 @@
 # $FreeBSD$
 
 ident		SOCFPGA
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../altera/socfpga/std.socfpga"
 
 makeoptions	MODULES_OVERRIDE=""

Modified: projects/pnfs-planb-server/sys/arm/conf/TEGRA124
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/TEGRA124	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/TEGRA124	Mon Oct 16 23:40:24 2017	(r324677)
@@ -18,7 +18,7 @@
 #
 # $FreeBSD$
 
-include  	"std.armv6"
+include  	"std.armv7"
 include 	"../nvidia/tegra124/std.tegra124"
 
 ident		TEGRA124

Copied: projects/pnfs-planb-server/sys/arm/conf/VIRT (from r324676, head/sys/arm/conf/VIRT)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/pnfs-planb-server/sys/arm/conf/VIRT	Mon Oct 16 23:40:24 2017	(r324677, copy of r324676, head/sys/arm/conf/VIRT)
@@ -0,0 +1,59 @@
+#
+# VIRT -- Custom configuration for the qemu virt platform
+#
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD$
+
+ident		VIRT
+
+include 	"std.armv7"
+include 	"../qemu/std.virt"
+
+options 	SCHED_ULE		# ULE scheduler
+options 	PLATFORM
+options 	SMP			# Enable multiple cores
+
+# Interrupt controller
+device		gic
+options 	INTRNG
+
+# ARM Generic Timer
+device		generic_timer
+
+device		bpf
+device		loop
+device		ether
+device		uart
+device		pty
+device		snp
+device		pl011
+device		psci
+
+device		virtio
+device		virtio_mmio
+device		virtio_blk
+device		vtnet
+
+device		md
+device		random			# Entropy device
+
+# Flattened Device Tree
+options 	FDT			# Configure using FDT/DTB data
+
+# Extensible Firmware Interface
+options 	EFI
+

Modified: projects/pnfs-planb-server/sys/arm/conf/VYBRID
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/VYBRID	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/VYBRID	Mon Oct 16 23:40:24 2017	(r324677)
@@ -19,7 +19,7 @@
 # $FreeBSD$
 
 ident		VYBRID
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../freescale/vybrid/std.vybrid"
 
 makeoptions	WERROR="-Werror"

Modified: projects/pnfs-planb-server/sys/arm/conf/ZEDBOARD
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/ZEDBOARD	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/ZEDBOARD	Mon Oct 16 23:40:24 2017	(r324677)
@@ -21,7 +21,7 @@
 
 ident		ZEDBOARD
 
-include 	"std.armv6"
+include 	"std.armv7"
 include 	"../xilinx/std.zynq7"
 
 makeoptions	MODULES_EXTRA="dtb/zynq"

Modified: projects/pnfs-planb-server/sys/arm/conf/std.armv6
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/std.armv6	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/conf/std.armv6	Mon Oct 16 23:40:24 2017	(r324677)
@@ -1,4 +1,4 @@
-# Standard kernel config items for all ARMv6/v7 systems.
+# Standard kernel config items for all ARMv6 systems.
 #
 # $FreeBSD$
 

Copied: projects/pnfs-planb-server/sys/arm/conf/std.armv7 (from r324676, head/sys/arm/conf/std.armv7)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/pnfs-planb-server/sys/arm/conf/std.armv7	Mon Oct 16 23:40:24 2017	(r324677, copy of r324676, head/sys/arm/conf/std.armv7)
@@ -0,0 +1,79 @@
+# Standard kernel config items for all ARMv7 systems.
+#
+# $FreeBSD$
+
+options 	HZ=1000
+options 	ARM_L2_PIPT		# Only L2 PIPT is supported
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+options 	TCP_HHOOK		# hhook(9) framework for TCP
+options 	IPSEC			# IP (v4/v6) security
+options 	SCTP			# Stream Control Transmission Protocol
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
+options 	NFSCL			# Network Filesystem Client
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	TMPFS			# Efficient memory filesystem
+options 	GEOM_PART_GPT		# GUID Partition Tables
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
+options 	GEOM_LABEL		# Provides labelization
+options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
+options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
+options 	VFP			# Enable floating point hardware support
+
+options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
+options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
+
+# DTrace support
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
+makeoptions	WITH_CTF=1
+
+# Debugging support.  Always need this:
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+options 	KDB			# Enable kernel debugger support.
+options 	KDB_TRACE		# Print a stack trace for a panic.
+
+# For full debugger support use (turn off in stable branch):
+options 	DDB			# Support DDB
+#options 	DEADLKRES		# Enable the deadlock resolver
+options 	INVARIANTS		# Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
+options 	ALT_BREAK_TO_DEBUGGER	# Enter debugger on keyboard escape sequence
+options 	USB_DEBUG		# Enable usb debug support code
+
+# Optional extras, never enabled by default:
+#options 	BOOTVERBOSE
+#options 	DEBUG			# May result in extreme spewage
+#options 	KTR
+#options 	KTR_COMPILE=KTR_ALL
+#options 	KTR_ENTRIES=16384
+#options 	KTR_MASK=(KTR_SPARE2)
+#options 	KTR_VERBOSE=0
+#options 	USB_REQ_DEBUG
+#options 	USB_VERBOSE
+#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
+

Modified: projects/pnfs-planb-server/sys/arm/freescale/imx/imx6_hdmi.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/freescale/imx/imx6_hdmi.c	Mon Oct 16 23:28:12 2017	(r324676)
+++ projects/pnfs-planb-server/sys/arm/freescale/imx/imx6_hdmi.c	Mon Oct 16 23:40:24 2017	(r324677)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
@@ -57,6 +58,7 @@ __FBSDID("$FreeBSD$");
 struct imx_hdmi_softc {
 	struct dwc_hdmi_softc	base;
 	phandle_t		i2c_xref;
+	eventhandler_tag	eh_tag;
 };
 
 static struct ofw_compat_data compat_data[] = {

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
